diff --git a/common/.vscode/settings.json b/common/.vscode/settings.json new file mode 100644 index 000000000..67b7397e0 --- /dev/null +++ b/common/.vscode/settings.json @@ -0,0 +1,78 @@ +{ + "files.associations": { + "__bit_reference": "cpp", + "__bits": "cpp", + "__config": "cpp", + "__debug": "cpp", + "__errc": "cpp", + "__hash_table": "cpp", + "__locale": "cpp", + "__mutex_base": "cpp", + "__node_handle": "cpp", + "__nullptr": "cpp", + "__split_buffer": "cpp", + "__string": "cpp", + "__threading_support": "cpp", + "__tree": "cpp", + "__tuple": "cpp", + "array": "cpp", + "atomic": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "compare": "cpp", + "complex": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "exception": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "ios": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "list": "cpp", + "locale": "cpp", + "map": "cpp", + "memory": "cpp", + "mutex": "cpp", + "new": "cpp", + "optional": "cpp", + "ostream": "cpp", + "ratio": "cpp", + "regex": "cpp", + "set": "cpp", + "sstream": "cpp", + "stack": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "string": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "thread": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "typeinfo": "cpp", + "unordered_map": "cpp", + "variant": "cpp", + "vector": "cpp", + "algorithm": "cpp" + } +} diff --git a/common/include/villas/boxes.hpp b/common/include/villas/boxes.hpp index 05ad3c618..417e4dfeb 100644 --- a/common/include/villas/boxes.hpp +++ b/common/include/villas/boxes.hpp @@ -8,46 +8,45 @@ #pragma once -/* The suffixed of the BOX_ macro a constructed by - * combining the following letters in the written order: - * - U for a line facing upwards - * - D for a line facing downwards - * - L for a line facing leftwards - * - R for a line facing rightwards - * - * E.g. a cross can be constructed by combining all line fragments: - * BOX_UDLR - */ -#if 0 /* Alternate character set */ +// The suffixed of the BOX_ macro a constructed by +// combining the following letters in the written order: +// - U for a line facing upwards +// - D for a line facing downwards +// - L for a line facing leftwards +// - R for a line facing rightwards +// +// E.g. a cross can be constructed by combining all line fragments: +// BOX_UDLR +#if 0 // Alternate character set #define BOX(chr) "\e(0" chr "\e(B" - #define BOX_LR BOX("\x71") /**< Boxdrawing: ─ */ - #define BOX_UD BOX("\x78") /**< Boxdrawing: │ */ - #define BOX_UDR BOX("\x74") /**< Boxdrawing: ├ */ - #define BOX_UDLR BOX("\x6E") /**< Boxdrawing: ┼ */ - #define BOX_UDL BOX("\x75") /**< Boxdrawing: ┤ */ - #define BOX_ULR BOX("\x76") /**< Boxdrawing: ┴ */ - #define BOX_UL BOX("\x6A") /**< Boxdrawing: ┘ */ - #define BOX_DLR BOX("\x77") /**< Boxdrawing: ┘ */ - #define BOX_DL BOX("\x6B") /**< Boxdrawing: ┘ */ -#elif 1 /* UTF-8 */ - #define BOX_LR "─" /**< Boxdrawing: ─ */ - #define BOX_UD "│" /**< Boxdrawing: │ */ - #define BOX_UDR "├" /**< Boxdrawing: ├ */ - #define BOX_UDLR "┼" /**< Boxdrawing: ┼ */ - #define BOX_UDL "┤" /**< Boxdrawing: ┤ */ - #define BOX_ULR "┴" /**< Boxdrawing: ┴ */ - #define BOX_UL "┘" /**< Boxdrawing: ┘ */ - #define BOX_DLR "┬" /**< Boxdrawing: ┘ */ - #define BOX_DL "┐" /**< Boxdrawing: ┘ */ - #define BOX_UR "└" /**< Boxdrawing: └ */ -#else /* ASCII */ - #define BOX_LR "-" /**< Boxdrawing: ─ */ - #define BOX_UD "|" /**< Boxdrawing: │ */ - #define BOX_UDR "+" /**< Boxdrawing: ├ */ - #define BOX_UDLR "+" /**< Boxdrawing: ┼ */ - #define BOX_UDL "+" /**< Boxdrawing: ┤ */ - #define BOX_ULR "+" /**< Boxdrawing: ┴ */ - #define BOX_UL "+" /**< Boxdrawing: ┘ */ - #define BOX_DLR "+" /**< Boxdrawing: ┘ */ - #define BOX_DL "+" /**< Boxdrawing: ┘ */ + #define BOX_LR BOX("\x71") // Boxdrawing: ─ + #define BOX_UD BOX("\x78") // Boxdrawing: │ + #define BOX_UDR BOX("\x74") // Boxdrawing: ├ + #define BOX_UDLR BOX("\x6E") // Boxdrawing: ┼ + #define BOX_UDL BOX("\x75") // Boxdrawing: ┤ + #define BOX_ULR BOX("\x76") // Boxdrawing: ┴ + #define BOX_UL BOX("\x6A") // Boxdrawing: ┘ + #define BOX_DLR BOX("\x77") // Boxdrawing: ┘ + #define BOX_DL BOX("\x6B") // Boxdrawing: ┘ +#elif 1 // UTF-8 + #define BOX_LR "─" // Boxdrawing: ─ + #define BOX_UD "│" // Boxdrawing: │ + #define BOX_UDR "├" // Boxdrawing: ├ + #define BOX_UDLR "┼" // Boxdrawing: ┼ + #define BOX_UDL "┤" // Boxdrawing: ┤ + #define BOX_ULR "┴" // Boxdrawing: ┴ + #define BOX_UL "┘" // Boxdrawing: ┘ + #define BOX_DLR "┬" // Boxdrawing: ┘ + #define BOX_DL "┐" // Boxdrawing: ┘ + #define BOX_UR "└" // Boxdrawing: └ +#else // ASCII + #define BOX_LR "-" // Boxdrawing: ─ + #define BOX_UD "|" // Boxdrawing: │ + #define BOX_UDR "+" // Boxdrawing: ├ + #define BOX_UDLR "+" // Boxdrawing: ┼ + #define BOX_UDL "+" // Boxdrawing: ┤ + #define BOX_ULR "+" // Boxdrawing: ┴ + #define BOX_UL "+" // Boxdrawing: ┘ + #define BOX_DLR "+" // Boxdrawing: ┘ + #define BOX_DL "+" // Boxdrawing: ┘ #endif diff --git a/common/include/villas/buffer.hpp b/common/include/villas/buffer.hpp index 763c2ba28..0946cc792 100644 --- a/common/include/villas/buffer.hpp +++ b/common/include/villas/buffer.hpp @@ -30,10 +30,10 @@ public: std::vector(count, 0) { } - /** Encode JSON document /p j and append it to the buffer */ + // Encode JSON document /p j and append it to the buffer int encode(json_t *j, int flags = 0); - /** Decode JSON document from the beginning of the buffer */ + // Decode JSON document from the beginning of the buffer json_t * decode(); void append(const char *data, size_t len) @@ -42,4 +42,4 @@ public: } }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/colors.hpp b/common/include/villas/colors.hpp index 5e2cdb6af..cbaf56895 100644 --- a/common/include/villas/colors.hpp +++ b/common/include/villas/colors.hpp @@ -8,18 +8,18 @@ #pragma once -/* CPP stringification */ +// CPP stringification #define XSTR(x) STR(x) #define STR(x) #x -/* Some color escape codes for pretty log messages */ +// Some color escape codes for pretty log messages #define CLR(clr, str) "\e[" XSTR(clr) "m" str "\e[0m" -#define CLR_GRY(str) CLR(30, str) /**< Print str in gray */ -#define CLR_RED(str) CLR(31, str) /**< Print str in red */ -#define CLR_GRN(str) CLR(32, str) /**< Print str in green */ -#define CLR_YEL(str) CLR(33, str) /**< Print str in yellow */ -#define CLR_BLU(str) CLR(34, str) /**< Print str in blue */ -#define CLR_MAG(str) CLR(35, str) /**< Print str in magenta */ -#define CLR_CYN(str) CLR(36, str) /**< Print str in cyan */ -#define CLR_WHT(str) CLR(37, str) /**< Print str in white */ -#define CLR_BLD(str) CLR( 1, str) /**< Print str in bold */ +#define CLR_GRY(str) CLR(30, str) // Print str in gray +#define CLR_RED(str) CLR(31, str) // Print str in red +#define CLR_GRN(str) CLR(32, str) // Print str in green +#define CLR_YEL(str) CLR(33, str) // Print str in yellow +#define CLR_BLU(str) CLR(34, str) // Print str in blue +#define CLR_MAG(str) CLR(35, str) // Print str in magenta +#define CLR_CYN(str) CLR(36, str) // Print str in cyan +#define CLR_WHT(str) CLR(37, str) // Print str in white +#define CLR_BLD(str) CLR( 1, str) // Print str in bold diff --git a/common/include/villas/common.hpp b/common/include/villas/common.hpp index b18bf1088..28b960653 100644 --- a/common/include/villas/common.hpp +++ b/common/include/villas/common.hpp @@ -10,7 +10,7 @@ #include -/* Common states for most objects in VILLAScommon (paths, nodes, hooks, plugins) */ +// Common states for most objects in VILLAScommon (paths, nodes, hooks, plugins) enum class State { DESTROYED = 0, INITIALIZED = 1, diff --git a/common/include/villas/compat.hpp b/common/include/villas/compat.hpp index 6b97b742c..e5a36846f 100644 --- a/common/include/villas/compat.hpp +++ b/common/include/villas/compat.hpp @@ -40,4 +40,4 @@ json_t *json_loadfd(int input, size_t flags, json_error_t *error); #define htobe16(x) OSSwapHostToBigInt16(x) #define htobe32(x) OSSwapHostToBigInt32(x) #define htobe64(x) OSSwapHostToBigInt64(x) -#endif /* __MACH__ */ +#endif // __MACH__ diff --git a/common/include/villas/cpuset.hpp b/common/include/villas/cpuset.hpp index 89f2dd80a..9072ae0ea 100644 --- a/common/include/villas/cpuset.hpp +++ b/common/include/villas/cpuset.hpp @@ -173,7 +173,7 @@ public: } }; -} /* namespace utils */ -} /* namespace villas */ +} // namespace utils +} // namespace villas #endif diff --git a/common/include/villas/dsp/exponential_window.hpp b/common/include/villas/dsp/exponential_window.hpp index 21eec81da..4d11070f3 100644 --- a/common/include/villas/dsp/exponential_window.hpp +++ b/common/include/villas/dsp/exponential_window.hpp @@ -34,5 +34,5 @@ public: } }; -} /* namespace dsp */ -} /* namespace villas */ +} // namespace dsp +} // namespace villas diff --git a/common/include/villas/dsp/moving_average_window.hpp b/common/include/villas/dsp/moving_average_window.hpp index 03031516f..e30160c1d 100644 --- a/common/include/villas/dsp/moving_average_window.hpp +++ b/common/include/villas/dsp/moving_average_window.hpp @@ -37,5 +37,5 @@ public: } }; -} /* namespace dsp */ -} /* namespace villas */ +} // namespace dsp +} // namespace villas diff --git a/common/include/villas/dsp/pid.hpp b/common/include/villas/dsp/pid.hpp index e3f34a147..4815994c1 100644 --- a/common/include/villas/dsp/pid.hpp +++ b/common/include/villas/dsp/pid.hpp @@ -38,5 +38,5 @@ public: double calculate(double setpoint, double pv); }; -} /* namespace dsp */ -} /* namespace villas */ +} // namespace dsp +} // namespace villas diff --git a/common/include/villas/dsp/window.hpp b/common/include/villas/dsp/window.hpp index e6568c41a..98c265395 100644 --- a/common/include/villas/dsp/window.hpp +++ b/common/include/villas/dsp/window.hpp @@ -88,5 +88,5 @@ public: } }; -} /* namespace dsp */ -} /* namespace villas */ +} // namespace dsp +} // namespace villas diff --git a/common/include/villas/dsp/window_cosine.hpp b/common/include/villas/dsp/window_cosine.hpp index 96e8e6ed9..2ad8f4743 100644 --- a/common/include/villas/dsp/window_cosine.hpp +++ b/common/include/villas/dsp/window_cosine.hpp @@ -18,7 +18,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 { @@ -113,5 +112,5 @@ public: CosineWindow(0.3635819, 0.4891775, 0.1365995, 0.0106411, 0., len, i) {} }; -} /* namespace dsp */ -} /* namespace villas */ +} // namespace dsp +} // namespace villas diff --git a/common/include/villas/exceptions.hpp b/common/include/villas/exceptions.hpp index da4bfb7ac..545c30f91 100644 --- a/common/include/villas/exceptions.hpp +++ b/common/include/villas/exceptions.hpp @@ -169,4 +169,4 @@ public: } }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/graph/directed.hpp b/common/include/villas/graph/directed.hpp index 506d87012..01a955009 100644 --- a/common/include/villas/graph/directed.hpp +++ b/common/include/villas/graph/directed.hpp @@ -45,7 +45,7 @@ public: if (vertexId >= vertices.size()) throw std::invalid_argument("vertex doesn't exist"); - // cannot use [] operator, because creates non-existing elements + // Cannot use [] operator, because creates non-existing elements // at() will throw std::out_of_range if element does not exist return vertices.at(vertexId); } @@ -70,16 +70,20 @@ public: if (edgeId >= lastEdgeId) throw std::invalid_argument("edge doesn't exist"); - // cannot use [] operator, because creates non-existing elements + // Cannot use [] operator, because creates non-existing elements // at() will throw std::out_of_range if element does not exist return edges.at(edgeId); } std::size_t getEdgeCount() const - { return edges.size(); } + { + return edges.size(); + } std::size_t getVertexCount() const - { return vertices.size(); } + { + return vertices.size(); + } VertexIdentifier addVertex(std::shared_ptr vertex) { @@ -95,19 +99,19 @@ public: VertexIdentifier fromVertexId, VertexIdentifier toVertexId) { - // allocate edge id + // Allocate edge id edge->id = lastEdgeId++; - // connect it + // Connect it edge->from = fromVertexId; edge->to = toVertexId; logger->debug("New edge {}: {} -> {}", *edge, edge->from, edge->to); - // this is a directed graph, so only push edge to starting vertex + // This is a directed graph, so only push edge to starting vertex getVertex(edge->from)->edges.push_back(edge->id); - // add new edge to graph + // Add new edge to graph edges[edge->id] = edge; return edge->id; @@ -117,7 +121,7 @@ public: EdgeIdentifier addDefaultEdge(VertexIdentifier fromVertexId, VertexIdentifier toVertexId) { - // create a new edge + // Create a new edge std::shared_ptr edge(new EdgeType); return addEdge(edge, fromVertexId, toVertexId); @@ -128,7 +132,7 @@ public: auto edge = getEdge(edgeId); auto startVertex = getVertex(edge->from); - // remove edge only from starting vertex (this is a directed graph) + // Remove edge only from starting vertex (this is a directed graph) logger->debug("Remove edge {} from vertex {}", edgeId, edge->from); startVertex->edges.remove(edgeId); @@ -138,7 +142,7 @@ public: void removeVertex(VertexIdentifier vertexId) { - // delete every edge that start or ends at this vertex + // Delete every edge that start or ends at this vertex auto it = edges.begin(); while (it != edges.end()) { auto &edgeId = it->first; @@ -159,7 +163,7 @@ public: if ((edge->from == vertexId) or removeEdge) { logger->debug("Remove edge {}", edgeId); - // remove edge from global edge list + // Remove edge from global edge list it = edges.erase(it); } else @@ -171,16 +175,18 @@ public: lastVertexId--; } - const std::list& - vertexGetEdges(VertexIdentifier vertexId) const - { return getVertex(vertexId)->edges; } - + const std::list& vertexGetEdges(VertexIdentifier vertexId) const + { + return getVertex(vertexId)->edges; + } using check_path_fn = std::function; - static bool - checkPath(const Path&) - { return true; } + static + bool checkPath(const Path&) + { + return true; + } bool getPath(VertexIdentifier fromVertexId, VertexIdentifier toVertexId, @@ -188,7 +194,7 @@ public: check_path_fn pathCheckFunc = checkPath) { if (fromVertexId == toVertexId) - // arrived at the destination + // Arrived at the destination return true; else { auto fromVertex = getVertex(fromVertexId); @@ -196,7 +202,7 @@ public: for (auto &edgeId : fromVertex->edges) { auto edgeOfFromVertex = getEdge(edgeId); - // loop detection + // Loop detection bool loop = false; for (auto &edgeIdInPath : path) { auto edgeInPath = getEdge(edgeIdInPath); @@ -211,15 +217,15 @@ public: continue; } - // remember the path we're investigating to detect loops + // Remember the path we're investigating to detect loops path.push_back(edgeId); - // recursive, depth-first search + // Recursive, depth-first search if (getPath(edgeOfFromVertex->to, toVertexId, path, pathCheckFunc) and pathCheckFunc(path)) - // path found, we're done + // Path found, we're done return true; else - // tear down path that didn't lead to the destination + // Tear down path that didn't lead to the destination path.pop_back(); } } @@ -233,7 +239,7 @@ public: for (auto &v : vertices) { auto &vertex = v.second; - // format connected vertices into a list + // Format connected vertices into a list std::stringstream ssEdges; for (auto &edge : vertex->edges) { ssEdges << getEdge(edge)->to << " "; @@ -278,5 +284,5 @@ protected: Logger logger; }; -} /* namespace graph */ -} /* namespace villas */ +} // namespace graph +} // namespace villas diff --git a/common/include/villas/graph/edge.hpp b/common/include/villas/graph/edge.hpp index 86b7e24e7..6cd655919 100644 --- a/common/include/villas/graph/edge.hpp +++ b/common/include/villas/graph/edge.hpp @@ -18,19 +18,26 @@ class Edge { public: using Identifier = std::size_t; - friend std::ostream& - operator<< (std::ostream &stream, const Edge &edge) - { return stream << edge.id; } + friend + std::ostream& operator<< (std::ostream &stream, const Edge &edge) + { + return stream << edge.id; + } - bool - operator==(const Edge &other) - { return this->id == other.id; } + bool operator==(const Edge &other) + { + return this->id == other.id; + } Vertex::Identifier getVertexTo() const - { return to; } + { + return to; + } Vertex::Identifier getVertexFrom() const - { return from; } + { + return from; + } private: Identifier id; @@ -38,5 +45,5 @@ private: Vertex::Identifier to; }; -} /* namespace graph */ -} /* namespace villas */ +} // namespace graph +} // namespace villas diff --git a/common/include/villas/graph/vertex.hpp b/common/include/villas/graph/vertex.hpp index 75b04d782..2b7256dbf 100644 --- a/common/include/villas/graph/vertex.hpp +++ b/common/include/villas/graph/vertex.hpp @@ -18,17 +18,21 @@ class Vertex { public: using Identifier = std::size_t; - const Identifier& - getIdentifier() const - { return id; } + const Identifier& getIdentifier() const + { + return id; + } - friend std::ostream& - operator<< (std::ostream &stream, const Vertex &vertex) - { return stream << vertex.id; } + friend + std::ostream& operator<< (std::ostream &stream, const Vertex &vertex) + { + return stream << vertex.id; + } - bool - operator==(const Vertex &other) - { return this->id == other.id; } + bool operator==(const Vertex &other) + { + return this->id == other.id; + } private: Identifier id; @@ -36,5 +40,5 @@ private: std::list edges; }; -} /* namespace graph */ -} /* namespace villas */ +} // namespace graph +} // namespace villas diff --git a/common/include/villas/hist.hpp b/common/include/villas/hist.hpp index f9a84b732..cc3220650 100644 --- a/common/include/villas/hist.hpp +++ b/common/include/villas/hist.hpp @@ -117,4 +117,4 @@ protected: double _m[2], _s[2]; /**< Private variables for online variance calculation */ }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/kernel/kernel.hpp b/common/include/villas/kernel/kernel.hpp index 87f810cbc..aa414723f 100644 --- a/common/include/villas/kernel/kernel.hpp +++ b/common/include/villas/kernel/kernel.hpp @@ -65,5 +65,5 @@ int get_cpu_frequency(uint64_t *freq); /** Set SMP affinity of IRQ */ int setIRQAffinity(unsigned irq, uintmax_t aff , uintmax_t *old); -} /* namespace villas */ -} /* namespace kernel */ +} // namespace villas +} // namespace kernel diff --git a/common/include/villas/kernel/pci.hpp b/common/include/villas/kernel/pci.hpp index 82a91a622..d02b370fa 100644 --- a/common/include/villas/kernel/pci.hpp +++ b/common/include/villas/kernel/pci.hpp @@ -120,6 +120,6 @@ public: lookupDevice(const Device &f); }; -} /* namespace pci */ -} /* namespace kernel */ -} /* namespace villas */ +} // namespace pci +} // namespace kernel +} // namespace villas diff --git a/common/include/villas/kernel/rt.hpp b/common/include/villas/kernel/rt.hpp index e4aa96dc5..79f6b8b14 100644 --- a/common/include/villas/kernel/rt.hpp +++ b/common/include/villas/kernel/rt.hpp @@ -31,6 +31,6 @@ void setPriority(int priority); */ bool isPreemptible(); -} /* namespace villas */ -} /* namespace kernel */ -} /* namespace rt */ +} // namespace villas +} // namespace kernel +} // namespace rt diff --git a/common/include/villas/kernel/vfio_container.hpp b/common/include/villas/kernel/vfio_container.hpp index 692aaddb8..50d0a5614 100644 --- a/common/include/villas/kernel/vfio_container.hpp +++ b/common/include/villas/kernel/vfio_container.hpp @@ -82,6 +82,6 @@ private: Logger log; }; -} /* namespace vfio */ -} /* namespace kernel */ -} /* namespace villas */ +} // namespace vfio +} // namespace kernel +} // namespace villas diff --git a/common/include/villas/kernel/vfio_device.hpp b/common/include/villas/kernel/vfio_device.hpp index c6a527c3d..6cb717cf2 100644 --- a/common/include/villas/kernel/vfio_device.hpp +++ b/common/include/villas/kernel/vfio_device.hpp @@ -99,6 +99,6 @@ private: Logger log; }; -} /* namespace vfio */ -} /* namespace kernel */ -} /* namespace villas */ +} // namespace vfio +} // namespace kernel +} // namespace villas diff --git a/common/include/villas/kernel/vfio_group.hpp b/common/include/villas/kernel/vfio_group.hpp index db0e82312..af1905519 100644 --- a/common/include/villas/kernel/vfio_group.hpp +++ b/common/include/villas/kernel/vfio_group.hpp @@ -74,6 +74,6 @@ private: Logger log; }; -} /* namespace vfio */ -} /* namespace kernel */ -} /* namespace villas */ +} // namespace vfio +} // namespace kernel +} // namespace villas diff --git a/common/include/villas/list.hpp b/common/include/villas/list.hpp index 6c4e9ee68..918e7ef3b 100644 --- a/common/include/villas/list.hpp +++ b/common/include/villas/list.hpp @@ -45,10 +45,10 @@ __attribute__((destructor(105))) static void UNIQUE(__dtor)() { \ namespace villas { -/** Callback to search or sort a list. */ +// Callback to search or sort a list. typedef int (*cmp_cb_t)(const void *, const void *); -/* The list data structure. */ +// The list data structure. struct List { enum State state; /**< The state of this list. */ void **array; /**< Array of pointers to list elements */ @@ -133,4 +133,4 @@ ssize_t list_lookup_index(struct List *l, const std::string &name) return f ? list_index(l, f) : -1; } -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/log.hpp b/common/include/villas/log.hpp index 855ae1341..3bbb48fbb 100644 --- a/common/include/villas/log.hpp +++ b/common/include/villas/log.hpp @@ -21,7 +21,7 @@ namespace villas { -/* Forward declarations */ +// Forward declarations class Log; using Logger = std::shared_ptr; @@ -80,4 +80,4 @@ public: std::string getLevelName() const; }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/log_opal_sink.hpp b/common/include/villas/log_opal_sink.hpp index 6aa052cdc..5a2f116cc 100644 --- a/common/include/villas/log_opal_sink.hpp +++ b/common/include/villas/log_opal_sink.hpp @@ -38,7 +38,7 @@ protected: void flush_() override { - /* nothing to do */ + // Nothing to do } }; @@ -46,5 +46,5 @@ using OpalSink_mt = OpalSink; using OpalSink_st = OpalSink; -} /* namespace node */ -} /* namespace villas */ +} // namespace node +} // namespace villas diff --git a/common/include/villas/memory.hpp b/common/include/villas/memory.hpp index 808835883..7ce425e70 100644 --- a/common/include/villas/memory.hpp +++ b/common/include/villas/memory.hpp @@ -49,9 +49,9 @@ public: } protected: - size_t offset; ///< Offset (or address) inside address space - size_t size; ///< Size in bytes of this block - MemoryManager::AddressSpaceId addrSpaceId; ///< Identifier in memory graph + size_t offset; // Offset (or address) inside address space + size_t size; // Size in bytes of this block + MemoryManager::AddressSpaceId addrSpaceId; // Identifier in memory graph }; /** @@ -70,13 +70,13 @@ class MemoryAccessor { public: using Type = T; - // take ownership of the MemoryBlock + // Take ownership of the MemoryBlock MemoryAccessor(std::unique_ptr mem) : translation(MemoryManager::get().getTranslationFromProcess(mem->getAddrSpaceId())), memoryBlock(std::move(mem)) { } - // just act as an accessor, do not take ownership of MemoryBlock + // Just act as an accessor, do not take ownership of MemoryBlock MemoryAccessor(const MemoryBlock &mem) : translation(MemoryManager::get().getTranslationFromProcess(mem.getAddrSpaceId())) { } @@ -113,10 +113,10 @@ public: } private: - /// cached memory translation for fast access + // Cached memory translation for fast access MemoryTranslation translation; - /// take the unique pointer in case user wants this class to have ownership + // Take the unique pointer in case user wants this class to have ownership std::unique_ptr memoryBlock; }; @@ -131,7 +131,7 @@ private: template class BaseAllocator { public: - /// memoryAddrSpaceId: memory that is managed by this allocator + // memoryAddrSpaceId: memory that is managed by this allocator BaseAllocator(MemoryManager::AddressSpaceId memoryAddrSpaceId) : memoryAddrSpaceId(memoryAddrSpaceId) { @@ -140,7 +140,7 @@ public: std::string loggerName = fmt::format("memory:", derivedAlloc->getName()); logger = logging.get(loggerName); - // default deallocation callback + // Default deallocation callback free = [&](MemoryBlock* mem) { logger->warn("no free callback defined for addr space {}, not freeing", mem->getAddrSpaceId()); @@ -165,7 +165,7 @@ public: allocate(size_t num) { if (num == 0) { - // doesn't make sense to allocate an empty block + // Doesn't make sense to allocate an empty block logger->error("Trying to allocate empty memory"); throw std::bad_alloc(); } @@ -202,7 +202,7 @@ protected: void removeMemoryBlock(const MemoryBlock &mem) { - // this will also remove any mapping to and from the memory block + // This will also remove any mapping to and from the memory block auto & mm = MemoryManager::get(); mm.removeAddressSpace(mem.getAddrSpaceId()); } @@ -215,7 +215,7 @@ protected: MemoryBlock::deallocator_fn free; Logger logger; - // optional, if allocator should own the memory block + // Optional, if allocator should own the memory block std::unique_ptr memoryBlock; private: @@ -268,10 +268,10 @@ private: return (alignBytes - (addr & alignMask)) & alignMask; } - size_t nextFreeAddress; ///< next chunk will be allocated here - size_t memorySize; ///< total size of managed memory - size_t internalOffset; ///< offset in address space (usually 0) - size_t allocationCount; ///< Number of individual allocations present + size_t nextFreeAddress; // Next chunk will be allocated here + size_t memorySize; // Total size of managed memory + size_t internalOffset; // Offset in address space (usually 0) + size_t allocationCount; // Number of individual allocations present }; @@ -344,4 +344,4 @@ private: getUdmaBufPhysAddr(int num); }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/memory_manager.hpp b/common/include/villas/memory_manager.hpp index c5f3575e4..608816ff6 100644 --- a/common/include/villas/memory_manager.hpp +++ b/common/include/villas/memory_manager.hpp @@ -41,18 +41,17 @@ public: size(size) { } - uintptr_t - getLocalAddr(uintptr_t addrInForeignAddrSpace) const; + uintptr_t getLocalAddr(uintptr_t addrInForeignAddrSpace) const; - uintptr_t - getForeignAddr(uintptr_t addrInLocalAddrSpace) const; + uintptr_t getForeignAddr(uintptr_t addrInLocalAddrSpace) const; - size_t - getSize() const - { return size; } + size_t getSize() const + { + return size; + } - friend std::ostream& - operator<< (std::ostream &stream, const MemoryTranslation &translation) + friend + std::ostream& operator<< (std::ostream &stream, const MemoryTranslation &translation) { return stream << std::hex << "(src=0x" << translation.src @@ -61,13 +60,13 @@ public: << ")"; } - /// Merge two MemoryTranslations together + // Merge two MemoryTranslations together MemoryTranslation &operator+=(const MemoryTranslation &other); private: - uintptr_t src; ///< Base address of local address space - uintptr_t dst; ///< Base address of foreign address space - size_t size; ///< Size of "memory window" + uintptr_t src; // Base address of local address space + uintptr_t dst; // Base address of foreign address space + size_t size; // Size of "memory window" }; @@ -115,10 +114,10 @@ private: */ class Mapping : public graph::Edge { public: - std::string name; ///< Human-readable name - uintptr_t src; ///< Base address in "from" address space - uintptr_t dest; ///< Base address in "to" address space - size_t size; ///< Size of the mapping + std::string name; // Human-readable name + uintptr_t src; // Base address in "from" address space + uintptr_t dest; // Base address in "to" address space + size_t size; // Size of the mapping friend std::ostream& operator<< (std::ostream &stream, const Mapping &mapping) @@ -143,7 +142,7 @@ private: */ class AddressSpace : public graph::Vertex { public: - std::string name; ///< Human-readable name + std::string name; // Human-readable name friend std::ostream& operator<< (std::ostream &stream, const AddressSpace &addrSpace) @@ -153,7 +152,7 @@ private: } }; - /// Memory graph with custom edges and vertices for address resolution + // Memory graph with custom edges and vertices for address resolution using MemoryGraph = graph::DirectedGraph; public: @@ -162,92 +161,99 @@ public: struct InvalidTranslation : public std::exception {}; - /// Get singleton instance + // Get singleton instance static MemoryManager& get(); MemoryGraph & getGraph() - { return memoryGraph; } + { + return memoryGraph; + } - AddressSpaceId - getProcessAddressSpace() - { return getOrCreateAddressSpace("process"); } + AddressSpaceId getProcessAddressSpace() + { + return getOrCreateAddressSpace("process"); + } - AddressSpaceId - getPciAddressSpace() - { return getOrCreateAddressSpace("pcie"); } + AddressSpaceId getPciAddressSpace() + { + return getOrCreateAddressSpace("pcie"); + } - AddressSpaceId - getProcessAddressSpaceMemoryBlock(const std::string &memoryBlock) - { return getOrCreateAddressSpace(getSlaveAddrSpaceName("process", memoryBlock)); } + AddressSpaceId getProcessAddressSpaceMemoryBlock(const std::string &memoryBlock) + { + return getOrCreateAddressSpace(getSlaveAddrSpaceName("process", memoryBlock)); + } - AddressSpaceId - getOrCreateAddressSpace(std::string name); + AddressSpaceId getOrCreateAddressSpace(std::string name); - void - removeAddressSpace(const AddressSpaceId &addrSpaceId) - { memoryGraph.removeVertex(addrSpaceId); } + void removeAddressSpace(const AddressSpaceId &addrSpaceId) + { + memoryGraph.removeVertex(addrSpaceId); + } - /// Create a default mapping - MappingId - createMapping(uintptr_t src, uintptr_t dest, size_t size, + // Create a default mapping + MappingId createMapping(uintptr_t src, uintptr_t dest, size_t size, const std::string &name, AddressSpaceId fromAddrSpace, AddressSpaceId toAddrSpace); - /// Add a mapping - /// - /// Can be used to derive from Mapping in order to implement custom - /// constructor/destructor. - MappingId - addMapping(std::shared_ptr mapping, + // Add a mapping + // + // Can be used to derive from Mapping in order to implement custom + // constructor/destructor. + MappingId addMapping(std::shared_ptr mapping, AddressSpaceId fromAddrSpace, AddressSpaceId toAddrSpace); - AddressSpaceId - findAddressSpace(const std::string &name); + AddressSpaceId findAddressSpace(const std::string &name); - std::list - findPath(const AddressSpaceId &fromAddrSpaceId, const AddressSpaceId &toAddrSpaceId); + std::list findPath(const AddressSpaceId &fromAddrSpaceId, const AddressSpaceId &toAddrSpaceId); - MemoryTranslation - getTranslation(const AddressSpaceId &fromAddrSpaceId, const AddressSpaceId &toAddrSpaceId); + MemoryTranslation getTranslation(const AddressSpaceId &fromAddrSpaceId, const AddressSpaceId &toAddrSpaceId); // cppcheck-suppress passedByValue MemoryTranslation getTranslationFromProcess(AddressSpaceId foreignAddrSpaceId) - { return getTranslation(getProcessAddressSpace(), foreignAddrSpaceId); } + { + return getTranslation(getProcessAddressSpace(), foreignAddrSpaceId); + } - static std::string - getSlaveAddrSpaceName(const std::string &ipInstance, const std::string &memoryBlock) - { return ipInstance + "/" + memoryBlock; } + static + std::string getSlaveAddrSpaceName(const std::string &ipInstance, const std::string &memoryBlock) + { + return ipInstance + "/" + memoryBlock; + } - static std::string - getMasterAddrSpaceName(const std::string &ipInstance, const std::string &busInterface) - { return ipInstance + ":" + busInterface; } + static + std::string getMasterAddrSpaceName(const std::string &ipInstance, const std::string &busInterface) + { + return ipInstance + ":" + busInterface; + } private: - /// Convert a Mapping to MemoryTranslation for calculations - static MemoryTranslation - getTranslationFromMapping(const Mapping &mapping) - { return MemoryTranslation(mapping.src, mapping.dest, mapping.size); } + // Convert a Mapping to MemoryTranslation for calculations + static + MemoryTranslation getTranslationFromMapping(const Mapping &mapping) + { + return MemoryTranslation(mapping.src, mapping.dest, mapping.size); + } - bool - pathCheck(const MemoryGraph::Path &path); + bool pathCheck(const MemoryGraph::Path &path); - /// Directed graph that stores address spaces and memory mappings + // Directed graph that stores address spaces and memory mappings MemoryGraph memoryGraph; - /// Cache mapping of names to address space ids for fast lookup + // Cache mapping of names to address space ids for fast lookup std::map addrSpaceLookup; - /// Logger for universal access in this class + // Logger for universal access in this class Logger logger; MemoryGraph::check_path_fn pathCheckFunc; - /// Static pointer to global instance, because this is a singleton + // Static pointer to global instance, because this is a singleton static MemoryManager* instance; }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/plugin.hpp b/common/include/villas/plugin.hpp index 2cf386eb1..8d124952c 100644 --- a/common/include/villas/plugin.hpp +++ b/common/include/villas/plugin.hpp @@ -21,7 +21,7 @@ namespace villas { namespace plugin { -/* Forward declarations */ +// Forward declarations class Plugin; class Registry; @@ -65,7 +65,7 @@ public: plugins.remove(p); } - /// Get all plugins including sub-registries + // Get all plugins including sub-registries List<> lookup() { List<> all; @@ -80,7 +80,7 @@ public: return all; } - /// Get all plugins of specific type + // Get all plugins of specific type template List lookup() { @@ -92,7 +92,7 @@ public: list.push_back(t); } - /* Sort alphabetically */ + // Sort alphabetically list.sort([](const T *a, const T *b) { return a->getName() < b->getName(); }); @@ -100,7 +100,7 @@ public: return list; } - /// Get all plugins of specific type and name + // Get all plugins of specific type and name template T * lookup(const std::string &name) { @@ -131,18 +131,18 @@ public: virtual ~Plugin(); - // copying a plugin doesn't make sense, so explicitly deny it + // Copying a plugin doesn't make sense, so explicitly deny it Plugin(Plugin const&) = delete; void operator=(Plugin const&) = delete; virtual void dump(); - /// Get plugin name + // Get plugin name virtual std::string getName() const = 0; - /// Get plugin type + // Get plugin type virtual std::string getType() const = 0; @@ -182,5 +182,5 @@ Registry::dump() } } -} /* namespace plugin */ -} /* namespace villas */ +} // namespace plugin +} // namespace villas diff --git a/common/include/villas/popen.hpp b/common/include/villas/popen.hpp index fcd16a136..d87fa7f7e 100644 --- a/common/include/villas/popen.hpp +++ b/common/include/villas/popen.hpp @@ -103,8 +103,8 @@ protected: } output; }; -} /* namespace utils */ -} /* namespace villas */ +} // namespace utils +} // namespace villas template std::istream &operator>>(villas::utils::PopenStream &po, T &value) diff --git a/common/include/villas/table.hpp b/common/include/villas/table.hpp index 0a8e3505d..4efdc1adc 100644 --- a/common/include/villas/table.hpp +++ b/common/include/villas/table.hpp @@ -84,4 +84,4 @@ public: } }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/task.hpp b/common/include/villas/task.hpp index e21fefe79..5fd3c2fd5 100644 --- a/common/include/villas/task.hpp +++ b/common/include/villas/task.hpp @@ -33,20 +33,20 @@ #endif struct Task { - int clock; /**< CLOCK_{MONOTONIC,REALTIME} */ + int clock; // CLOCK_{MONOTONIC,REALTIME} -#if PERIODIC_TASK_IMPL == RDTSC /* We use cycle counts in RDTSC mode */ +#if PERIODIC_TASK_IMPL == RDTSC // We use cycle counts in RDTSC mode uint64_t period; uint64_t next; #else - struct timespec period; /**< The period of periodic invations of this task */ - struct timespec next; /**< The timer value for the next invocation */ + struct timespec period; // The period of periodic invations of this task + struct timespec next; // The timer value for the next invocation #endif #if PERIODIC_TASK_IMPL == TIMERFD - int fd; /**< The timerfd_create(2) file descriptior. */ + 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. */ @@ -54,11 +54,10 @@ struct Task { ~Task(); - /** Wait until task elapsed - * - * @retval 0 An error occured. Maybe the task was stopped. - * @retval >0 The nummer of runs this task already fired. - */ + // Wait until task elapsed + // + // @retval 0 An error occured. Maybe the task was stopped. + // @retval >0 The nummer of runs this task already fired. uint64_t wait(); void setNext(const struct timespec *next); @@ -67,9 +66,8 @@ struct Task { void stop(); - /** Returns a poll'able file descriptor which becomes readable when the timer expires. - * - * Note: currently not supported on all platforms. - */ + // Returns a poll'able file descriptor which becomes readable when the timer expires. + // + // Note: currently not supported on all platforms. int getFD() const; }; diff --git a/common/include/villas/terminal.hpp b/common/include/villas/terminal.hpp index f4f612272..05bc416e7 100644 --- a/common/include/villas/terminal.hpp +++ b/common/include/villas/terminal.hpp @@ -47,4 +47,4 @@ public: } }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/tool.hpp b/common/include/villas/tool.hpp index dfb263298..f7762cac7 100644 --- a/common/include/villas/tool.hpp +++ b/common/include/villas/tool.hpp @@ -55,4 +55,4 @@ public: int run(); }; -} /* namespace villas */ +} // namespace villas diff --git a/common/include/villas/utils.hpp b/common/include/villas/utils.hpp index 132cb651e..4ef0d1106 100644 --- a/common/include/villas/utils.hpp +++ b/common/include/villas/utils.hpp @@ -41,7 +41,7 @@ } while (0) #endif -/* CPP stringification */ +// CPP stringification #define XSTR(x) STR(x) #define STR(x) #x @@ -62,19 +62,19 @@ y = t; \ } while (0) -/** Round-up integer division */ +// Round-up integer division #define CEIL(x, y) (((x) + (y) - 1) / (y)) -/** Get nearest up-rounded power of 2 */ +// Get nearest up-rounded power of 2 #define LOG2_CEIL(x) (1 << (villas::utils::log2i((x) - 1) + 1)) -/** Check if the number is a power of 2 */ +// Check if the number is a power of 2 #define IS_POW2(x) (((x) != 0) && !((x) & ((x) - 1))) -/** Calculate the number of elements in an array. */ +// Calculate the number of elements in an array. #define ARRAY_LEN(a) ( sizeof (a) / sizeof (a)[0] ) -/* Return the bigger value */ +// Return the bigger value #ifdef MAX #undef MAX #endif @@ -82,7 +82,7 @@ __typeof__ (b) _b = (b); \ _a > _b ? _a : _b; }) -/* Return the smaller value */ +// Return the smaller value #ifdef MIN #undef MIN #endif @@ -103,7 +103,7 @@ #define BITS_PER_LONGLONG (sizeof(long long) * 8) -/* Some helper macros */ +// Some helper macros #define BITMASK(h, l) (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONGLONG - 1 - (h)))) #define BIT(nr) (1UL << (nr)) @@ -204,6 +204,6 @@ using byte = std::uint8_t; std::string encode(const std::vector &input); std::vector decode(const std::string &input); -} /* namespace base64 */ -} /* namespace utils */ -} /* namespace villas */ +} // namespace base64 +} // namespace utils +} // namespace villas diff --git a/common/include/villas/uuid.hpp b/common/include/villas/uuid.hpp index bd5ac4020..c99e38d79 100644 --- a/common/include/villas/uuid.hpp +++ b/common/include/villas/uuid.hpp @@ -28,5 +28,5 @@ void generateFromJson(uuid_t out, json_t *json, const std::string &ns = ""); /** Generate an UUID by MD5 hashing the serialized representation of the provided JSON object */ int generateFromJson(uuid_t out, json_t *json, const uuid_t ns); -} /* namespace uuid */ -} /* namespace villas */ +} // namespace uuid +} // namespace villas diff --git a/common/include/villas/version.hpp b/common/include/villas/version.hpp index e375406ca..d07818188 100644 --- a/common/include/villas/version.hpp +++ b/common/include/villas/version.hpp @@ -26,13 +26,30 @@ public: Version(int maj, int min = 0, int pat = 0); - inline bool operator==(const Version &rhs) { return cmp(*this, rhs) == 0; } - inline bool operator!=(const Version &rhs) { return cmp(*this, rhs) != 0; } - inline bool operator< (const Version &rhs) { return cmp(*this, rhs) < 0; } - inline bool operator> (const Version &rhs) { return cmp(*this, rhs) > 0; } - inline bool operator<=(const Version &rhs) { return cmp(*this, rhs) <= 0; } - inline bool operator>=(const Version &rhs) { return cmp(*this, rhs) >= 0; } + inline bool operator==(const Version &rhs) { + return cmp(*this, rhs) == 0; + } + + inline bool operator!=(const Version &rhs) { + return cmp(*this, rhs) != 0; + } + + inline bool operator< (const Version &rhs) { + return cmp(*this, rhs) < 0; + } + + inline bool operator> (const Version &rhs) { + return cmp(*this, rhs) > 0; + } + + inline bool operator<=(const Version &rhs) { + return cmp(*this, rhs) <= 0; + } + + inline bool operator>=(const Version &rhs) { + return cmp(*this, rhs) >= 0; + } }; -} /* namespace villas */ -} /* namespace utils */ +} // namespace villas +} // namespace utils diff --git a/common/lib/base64.cpp b/common/lib/base64.cpp index 8e8a29c98..91bc7fb73 100644 --- a/common/lib/base64.cpp +++ b/common/lib/base64.cpp @@ -111,6 +111,6 @@ std::vector decode(const std::string &input) return decoded; } -} /* namespace base64 */ -} /* namespace utils */ -} /* namespace villas */ +} // namespace base64 +} // namespace utils +} // namespace villas diff --git a/common/lib/buffer.cpp b/common/lib/buffer.cpp index 6527c5212..81970534b 100644 --- a/common/lib/buffer.cpp +++ b/common/lib/buffer.cpp @@ -19,7 +19,7 @@ json_t * Buffer::decode() if (!j) return nullptr; - /* Remove decoded JSON document from beginning */ + // Remove decoded JSON document from beginning erase(begin(), begin() + err.position); return j; @@ -34,7 +34,7 @@ int Buffer::callback(const char *data, size_t len, void *ctx) { Buffer *b = static_cast(ctx); - /* Append junk of JSON to buffer */ + // Append junk of JSON to buffer b->insert(b->end(), &data[0], &data[len]); return 0; diff --git a/common/lib/compat.cpp b/common/lib/compat.cpp index 63f0e14dc..57a8ea4fd 100644 --- a/common/lib/compat.cpp +++ b/common/lib/compat.cpp @@ -21,7 +21,7 @@ size_t json_dumpb(const json_t *json, char *buffer, size_t size, size_t flags) if (!str) return 0; - len = strlen(str); /* not \0 terminated */ + len = strlen(str); // Not \0 terminated if (buffer && len <= size) memcpy(buffer, str, len); @@ -54,7 +54,7 @@ static int json_dumpfd_callback(const char *buffer, size_t size, void *data) (void)buffer; (void)size; (void)data; -#endif /* HAVE_UNISTD_H */ +#endif // HAVE_UNISTD_H return -1; } @@ -63,4 +63,4 @@ int json_dumpfd(const json_t *json, int output, size_t flags) { return json_dump_callback(json, json_dumpfd_callback, (void *) &output, flags); } -#endif /* JANSSON_VERSION_HEX < 0x020A00 */ +#endif // JANSSON_VERSION_HEX < 0x020A00 diff --git a/common/lib/cpuset.cpp b/common/lib/cpuset.cpp index 748de34e2..644af1ab8 100644 --- a/common/lib/cpuset.cpp +++ b/common/lib/cpuset.cpp @@ -113,4 +113,4 @@ CpuSet::operator std::string () return ss.str(); } -#endif /* __linux__ */ +#endif // __linux__ diff --git a/common/lib/dsp/pid.cpp b/common/lib/dsp/pid.cpp index f73bc1e0a..e2e2e0509 100644 --- a/common/lib/dsp/pid.cpp +++ b/common/lib/dsp/pid.cpp @@ -25,30 +25,30 @@ PID::PID(double _dt, double _max, double _min, double _Kp, double _Kd, double _K double PID::calculate(double setpoint, double pv) { - /* Calculate error */ + // Calculate error double error = setpoint - pv; - /* Proportional term */ + // Proportional term double Pout = Kp * error; - /* Integral term */ + // Integral term integral += error * dt; double Iout = Ki * integral; - /* Derivative term */ + // Derivative term double derivative = (error - pre_error) / dt; double Dout = Kd * derivative; - /* Calculate total output */ + // Calculate total output double output = Pout + Iout + Dout; - /* Restrict to max/min */ + // Restrict to max/min if (output > max) output = max; else if (output < min) output = min; - /* Save error to previous error */ + // Save error to previous error pre_error = error; return output; diff --git a/common/lib/hist.cpp b/common/lib/hist.cpp index 15c6eefe2..ef2946a28 100644 --- a/common/lib/hist.cpp +++ b/common/lib/hist.cpp @@ -39,7 +39,7 @@ void Hist::put(double value) { last = value; - /* Update min/max */ + // Update min/max if (value > highest) highest = value; if (value < lowest) @@ -47,7 +47,7 @@ void Hist::put(double value) if (data.size()) { if (total < warmup) { - /* We are still in warmup phase... Waiting for more samples... */ + // We are still in warmup phase... Waiting for more samples... } else if (data.size() && total == warmup && warmup != 0) { low = getMean() - 3 * getStddev(); @@ -55,13 +55,13 @@ void Hist::put(double value) resolution = (high - low) / data.size(); } else if (data.size() && (total == warmup) && (warmup == 0)) { - // there is no warmup phase + // There is no warmup phase // TODO resolution = ? } else { idx_t idx = std::round((value - low) / resolution); - /* Check bounds and increment */ + // Check bounds and increment if (idx >= (idx_t) data.size()) higher++; else if (idx < 0) @@ -73,8 +73,8 @@ void Hist::put(double value) total++; - /* Online / running calculation of variance and mean - * by Donald Knuth’s Art of Computer Programming, Vol 2, page 232, 3rd edition */ + // Online / running calculation of variance and mean + // by Donald Knuth’s Art of Computer Programming, Vol 2, page 232, 3rd edition if (total == 1) { _m[1] = _m[0] = value; _s[1] = 0.0; @@ -83,7 +83,7 @@ void Hist::put(double value) _m[0] = _m[1] + (value - _m[1]) / total; _s[0] = _s[1] + (value - _m[1]) * (value - _m[0]); - /* Set up for next iteration */ + // Set up for next iteration _m[1] = _m[0]; _s[1] = _s[0]; } @@ -144,7 +144,7 @@ void Hist::print(Logger logger, bool details) const void Hist::plot(Logger logger) const { - /* Get highest bar */ + // Get highest bar Hist::cnt_t max = *std::max_element(data.begin(), data.end()); std::vector cols = { @@ -155,7 +155,7 @@ void Hist::plot(Logger logger) const Table table = Table(logger, cols); - /* Print plot */ + // Print plot table.header(); for (size_t i = 0; i < data.size(); i++) { @@ -263,4 +263,4 @@ int Hist::dumpMatlab(FILE *f) const return 0; } -} /* namespace villas */ +} // namespace villas diff --git a/common/lib/kernel/kernel.cpp b/common/lib/kernel/kernel.cpp index eb8903928..4f70b1a87 100644 --- a/common/lib/kernel/kernel.cpp +++ b/common/lib/kernel/kernel.cpp @@ -37,7 +37,7 @@ Version villas::kernel::getVersion() std::string rel = uts.release; - /* Remove release part. E.g. 4.9.93-linuxkit-aufs */ + // Remove release part. E.g. 4.9.93-linuxkit-aufs auto sep = rel.find('-'); auto ver = rel.substr(0, sep - 1); @@ -49,7 +49,7 @@ int villas::kernel::getCachelineSize() #if defined(__linux__) && defined(__x86_64__) && defined(__GLIBC__) return sysconf(_SC_LEVEL1_ICACHE_LINESIZE); #elif defined(__MACH__) - /* Open the command for reading. */ + // Open the command for reading. FILE *fp = popen("sysctl -n machdep.cpu.cache.linesize", "r"); if (fp == nullptr) return -1; @@ -75,7 +75,7 @@ int villas::kernel::getPageSize() #error "Unsupported platform" #endif -/* There is no sysconf interface to get the hugepage size */ +// There is no sysconf interface to get the hugepage size int villas::kernel::getHugePageSize() { #ifdef __linux__ @@ -146,12 +146,12 @@ int villas::kernel::loadModule(const char *module) pid_t pid = fork(); switch (pid) { - case -1: /* error */ + case -1: // Error return -1; - case 0: /* child */ + case 0: // Child execlp("modprobe", "modprobe", module, (char *) 0); - exit(EXIT_FAILURE); /* exec never returns */ + exit(EXIT_FAILURE); // exec() never returns default: wait(&ret); @@ -210,7 +210,7 @@ int villas::kernel::getCmdlineParam(const char *param, char *buf, size_t len) if (ret >= 2 && buf) snprintf(buf, len, "%s", value); - return 0; /* found */ + return 0; // Found } } } while ((tok = strtok_r(nullptr, " \t", &lasts))); @@ -218,7 +218,7 @@ int villas::kernel::getCmdlineParam(const char *param, char *buf, size_t len) out: fclose(f); - return -1; /* not found or error */ + return -1; // Not found or error } int villas::kernel::getNrHugepages() @@ -266,7 +266,7 @@ int villas::kernel::setIRQAffinity(unsigned irq, uintmax_t aff, uintmax_t *old) f = fopen(fn, "w+"); if (!f) - return -1; /* IRQ does not exist */ + return -1; // IRQ does not exist if (old) ret = fscanf(f, "%jx", old); @@ -285,7 +285,7 @@ int villas::kernel::get_cpu_frequency(uint64_t *freq) int ret; FILE *f; - /* Try to get CPU frequency from cpufreq module */ + // Try to get CPU frequency from cpufreq module f = fopen(SYSFS_PATH "/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", "r"); if (!f) goto cpuinfo; @@ -295,16 +295,16 @@ int villas::kernel::get_cpu_frequency(uint64_t *freq) if (ret != 1) return -1; - /* cpufreq reports kHz */ + // cpufreq reports kHz *freq = *freq * 1000; return 0; cpuinfo: - /* Try to read CPU frequency from /proc/cpuinfo */ + // Try to read CPU frequency from /proc/cpuinfo f = fopen(PROCFS_PATH "/cpuinfo", "r"); if (!f) - return -1; /* We give up here */ + return -1; // We give up here ret = -1; while (getline(&line, &len, f) >= 0) { @@ -329,7 +329,7 @@ cpuinfo: goto out; } - /* Frequency is given in MHz */ + // Frequency is given in MHz *freq = dfreq * 1e6; out: fclose(f); @@ -337,4 +337,4 @@ out: fclose(f); return ret; } -#endif /* __linux__ */ +#endif // __linux__ diff --git a/common/lib/kernel/pci.cpp b/common/lib/kernel/pci.cpp index e14edad54..59fb8dcb7 100644 --- a/common/lib/kernel/pci.cpp +++ b/common/lib/kernel/pci.cpp @@ -35,7 +35,7 @@ DeviceList::DeviceList() throw SystemError("Failed to detect PCI devices"); while ((e = readdir(dp))) { - /* Ignore special entries */ + // Ignore special entries if ((strcmp(e->d_name, ".") == 0) || (strcmp(e->d_name, "..") == 0) ) continue; @@ -48,7 +48,7 @@ DeviceList::DeviceList() { "device", &id.device } }; - /* Read vendor & device id */ + // Read vendor & device id for (int i = 0; i < 2; i++) { snprintf(path, sizeof(path), "%s/bus/pci/devices/%s/%s", SYSFS_PATH, e->d_name, map[i].s); @@ -63,7 +63,7 @@ DeviceList::DeviceList() fclose(f); } - /* Get slot id */ + // Get slot id ret = sscanf(e->d_name, "%4x:%2x:%2x.%u", &slot.domain, &slot.bus, &slot.device, &slot.function); if (ret != 4) throw RuntimeError("Failed to parse PCI slot number: {}", e->d_name); @@ -280,7 +280,7 @@ Device::getRegions() const int reg_num = 0; - /* Cap to 8 regions, just because we don't know how many may exist. */ + // Cap to 8 regions, just because we don't know how many may exist. while (reg_num < 8 && (bytesRead = getline(&line, &len, f)) != -1) { unsigned long long tokens[3]; char* s = line; @@ -289,7 +289,7 @@ Device::getRegions() const tokens[i] = strtoull(s, &end, 16); if (s == end) { printf("Error parsing line %d of %s\n", reg_num + 1, sysfs); - tokens[0] = tokens[1] = 0; /* Mark invalid */ + tokens[0] = tokens[1] = 0; // Mark invalid break; } s = end; @@ -297,11 +297,11 @@ Device::getRegions() const free(line); - /* Required for getline() to allocate a new buffer on the next iteration. */ + // Required for getline() to allocate a new buffer on the next iteration. line = nullptr; len = 0; - if (tokens[0] != tokens[1]) { /* This is a valid region */ + if (tokens[0] != tokens[1]) { // This is a valid region Region region; region.num = reg_num; @@ -348,7 +348,7 @@ Device::attachDriver(const std::string &driver) const FILE *f; char fn[1024]; - /* Add new ID to driver */ + // Add new ID to driver snprintf(fn, sizeof(fn), "%s/bus/pci/drivers/%s/new_id", SYSFS_PATH, driver.c_str()); f = fopen(fn, "w"); if (!f) @@ -359,7 +359,7 @@ Device::attachDriver(const std::string &driver) const fprintf(f, "%04x %04x", id.vendor, id.device); fclose(f); - /* Bind to driver */ + // Bind to driver snprintf(fn, sizeof(fn), "%s/bus/pci/drivers/%s/bind", SYSFS_PATH, driver.c_str()); f = fopen(fn, "w"); if (!f) @@ -377,7 +377,7 @@ Device::getIOMMUGroup() const { int ret; char *group; - // readlink does not add a null terminator! + // readlink() does not add a null terminator! char link[1024] = {0}; char sysfs[1024]; diff --git a/common/lib/kernel/rt.cpp b/common/lib/kernel/rt.cpp index a9207c495..e03c90d95 100644 --- a/common/lib/kernel/rt.cpp +++ b/common/lib/kernel/rt.cpp @@ -20,7 +20,7 @@ #ifdef __linux__ using villas::utils::CpuSet; -#endif /* __linux__ */ +#endif // __linux__ namespace villas { namespace kernel { @@ -36,7 +36,7 @@ void init(int priority, int affinity) int is_rt, is_isol; char isolcpus[255]; - /* Use FIFO scheduler with real time priority */ + // Use FIFO scheduler with real time priority is_rt = isPreemptible(); if (!is_rt) logger->warn("We recommend to use an PREEMPT_RT patched kernel!"); @@ -68,7 +68,7 @@ void init(int priority, int affinity) (void) affinity; (void) priority; -#endif /* __linux__ */ +#endif // __linux__ } #ifdef __linux__ @@ -80,7 +80,7 @@ void setProcessAffinity(int affinity) Logger logger = logging.get("kernel:rt"); - /* Pin threads to CPUs by setting the affinity */ + // Pin threads to CPUs by setting the affinity CpuSet cset_pin(affinity); ret = sched_setaffinity(0, cset_pin.size(), cset_pin); @@ -127,8 +127,8 @@ bool isPreemptible() return access(SYSFS_PATH "/kernel/realtime", R_OK) == 0; } -#endif /* __linux__ */ +#endif // __linux__ -} /* namespace villas */ -} /* namespace kernel */ -} /* namespace rt */ +} // namespace villas +} // namespace kernel +} // namespace rt diff --git a/common/lib/kernel/vfio_device.cpp b/common/lib/kernel/vfio_device.cpp index d971a2826..6ceebc0d5 100644 --- a/common/lib/kernel/vfio_device.cpp +++ b/common/lib/kernel/vfio_device.cpp @@ -144,7 +144,7 @@ bool Device::reset() if (this->info.flags & VFIO_DEVICE_FLAGS_RESET) return ioctl(this->fd, VFIO_DEVICE_RESET) == 0; else - return false; // not supported by this device + return false; // Not supported by this device } void * Device::regionMap(size_t index) diff --git a/common/lib/list.cpp b/common/lib/list.cpp index b24d0c051..a5322e52f 100644 --- a/common/lib/list.cpp +++ b/common/lib/list.cpp @@ -64,7 +64,7 @@ void villas::list_push(struct List *l, void *p) assert(l->state == State::INITIALIZED); - /* Resize array if out of capacity */ + // Resize array if out of capacity if (l->length >= l->capacity) { l->capacity += LIST_CHUNKSIZE; l->array = (void **) realloc(l->array, l->capacity * sizeof(void *)); @@ -116,7 +116,7 @@ int villas::list_insert(struct List *l, size_t idx, void *p) if (idx >= l->length) return -1; - /* Resize array if out of capacity */ + // Resize array if out of capacity if (l->length + 1 > l->capacity) { l->capacity += LIST_CHUNKSIZE; l->array = (void **) realloc(l->array, l->capacity * sizeof(void *)); @@ -198,7 +198,7 @@ void * villas::list_search(struct List *l, cmp_cb_t cmp, const void *ctx) goto out; } - e = nullptr; /* not found */ + e = nullptr; // Not found out: pthread_mutex_unlock(&l->lock); diff --git a/common/lib/log.cpp b/common/lib/log.cpp index bbb4855e6..2e067ee7a 100644 --- a/common/lib/log.cpp +++ b/common/lib/log.cpp @@ -65,7 +65,7 @@ Log::Log(Level lvl) : setLevel(level); setFormatter(pattern, p ? p : ""); - /* Default sink */ + // Default sink sink = std::make_shared(); sinks->add_sink(sink); @@ -94,7 +94,7 @@ Logger Log::get(const std::string &name) for (auto &expr : expressions) { int flags = 0; #ifdef FNM_EXTMATCH - /* musl-libc doesnt support this flag yet */ + // musl-libc doesnt support this flag yet flags |= FNM_EXTMATCH; #endif if (!fnmatch(expr.name.c_str(), name.c_str(), flags)) diff --git a/common/lib/memory.cpp b/common/lib/memory.cpp index 17954d671..2ffad705e 100644 --- a/common/lib/memory.cpp +++ b/common/lib/memory.cpp @@ -20,7 +20,7 @@ namespace villas { std::unique_ptr HostRam::HostRamAllocator::allocateBlock(size_t size) { - /* Align to next bigger page size chunk */ + // Align to next bigger page size chunk if (size & size_t(0xFFF)) { size += size_t(0x1000); size &= size_t(~0xFFF); @@ -40,7 +40,7 @@ HostRam::HostRamAllocator::allocateBlock(size_t size) auto &mm = MemoryManager::get(); - /* Assemble name for this block */ + // Assemble name for this block std::stringstream name; name << std::showbase << std::hex << reinterpret_cast(addr); @@ -65,7 +65,7 @@ LinearAllocator::LinearAllocator(MemoryManager::AddressSpaceId memoryAddrSpaceId internalOffset(internalOffset), allocationCount(0) { - /* Make sure to start at aligned offset, reduce size in case we need padding */ + // Make sure to start at aligned offset, reduce size in case we need padding if (const size_t paddingBytes = getAlignmentPadding(internalOffset)) { assert(paddingBytes < memorySize); @@ -73,7 +73,7 @@ LinearAllocator::LinearAllocator(MemoryManager::AddressSpaceId memoryAddrSpaceId memorySize -= paddingBytes; } - /* Deallocation callback */ + // Deallocation callback free = [&](MemoryBlock* mem) { logger->debug("Deallocating memory block at local addr {:#x} (addr space {})", mem->getOffset(), mem->getAddrSpaceId()); @@ -84,7 +84,7 @@ LinearAllocator::LinearAllocator(MemoryManager::AddressSpaceId memoryAddrSpaceId if (allocationCount == 0) { logger->debug("All allocations are deallocated now, freeing memory"); - /* All allocations have been deallocated, free all memory */ + // All allocations have been deallocated, free all memory nextFreeAddress = 0; } @@ -113,28 +113,28 @@ LinearAllocator::allocateBlock(size_t size) throw std::bad_alloc(); } - /* Assign address */ + // Assign address const uintptr_t localAddr = nextFreeAddress + internalOffset; - /* Reserve memory */ + // Reserve memory nextFreeAddress += size; - /* Make sure it is aligned */ + // Make sure it is aligned if (const size_t paddingBytes = getAlignmentPadding(nextFreeAddress)) { nextFreeAddress += paddingBytes; - /* If next free address is outside this block due to padding, cap it */ + // If next free address is outside this block due to padding, cap it nextFreeAddress = std::min(nextFreeAddress, memorySize); } auto &mm = MemoryManager::get(); - /* Assemble name for this block */ + // Assemble name for this block std::stringstream blockName; blockName << std::showbase << std::hex << localAddr; - /* Create address space */ + // Create address space auto addrSpaceName = mm.getSlaveAddrSpaceName(getName(), blockName.str()); auto addrSpaceId = mm.getOrCreateAddressSpace(addrSpaceName); @@ -144,10 +144,10 @@ LinearAllocator::allocateBlock(size_t size) std::unique_ptr mem(new MemoryBlock(localAddr, size, addrSpaceId), this->free); - /* Mount block into the memory graph */ + // Mount block into the memory graph insertMemoryBlock(*mem); - /* Increase the allocation count */ + // Increase the allocation count allocationCount++; return mem; @@ -219,13 +219,13 @@ HostDmaRam::HostDmaRamAllocator::~HostDmaRamAllocator() auto translation = mm.getTranslationFromProcess(getAddrSpaceId()); baseVirt = reinterpret_cast(translation.getLocalAddr(0)); } catch (const std::out_of_range&) { - /* Not mapped, nothing to do */ + // Not mapped, nothing to do return; } logger->debug("Unmapping {}", getName()); - /* Try to unmap it */ + // Try to unmap it if (::munmap(baseVirt, getSize()) != 0) { logger->warn("munmap() failed for {:p} of size {:#x}", baseVirt, getSize()); @@ -287,4 +287,4 @@ HostDmaRam::HostDmaRamAllocator&HostDmaRam::getAllocator(int num) return *allocator; } -} /* namespace villas */ +} // namespace villas diff --git a/common/lib/memory_manager.cpp b/common/lib/memory_manager.cpp index 81dfc6f15..ef0b8000f 100644 --- a/common/lib/memory_manager.cpp +++ b/common/lib/memory_manager.cpp @@ -37,14 +37,14 @@ MemoryManager::AddressSpaceId MemoryManager::getOrCreateAddressSpace(std::string name) { try { - /* Try fast lookup */ + // Try fast lookup return addrSpaceLookup.at(name); } catch (const std::out_of_range&) { - /* Does not yet exist, create */ + // Does not yet exist, create std::shared_ptr addrSpace(new AddressSpace); addrSpace->name = name; - /* Cache it for the next access */ + // Cache it for the next access addrSpaceLookup[name] = memoryGraph.addVertex(addrSpace); return addrSpaceLookup[name]; @@ -93,7 +93,7 @@ MemoryManager::findPath(const MemoryManager::AddressSpaceId &fromAddrSpaceId, auto fromAddrSpace = memoryGraph.getVertex(fromAddrSpaceId); auto toAddrSpace = memoryGraph.getVertex(toAddrSpaceId); - /* Find a path through the memory graph */ + // Find a path through the memory graph MemoryGraph::Path pathGraph; if (not memoryGraph.getPath(fromAddrSpaceId, toAddrSpaceId, pathGraph, pathCheckFunc)) { @@ -145,9 +145,8 @@ MemoryManager::pathCheck(const MemoryGraph::Path &path) // Start with an identity mapping MemoryTranslation translation(0, 0, SIZE_MAX); - /* Try to add all mappings together to a common translation. If this fails - * there is a non-overlapping window. - */ + // Try to add all mappings together to a common translation. If this fails + // there is a non-overlapping window. for (auto &mappingId : path) { auto mapping = memoryGraph.getEdge(mappingId); try { @@ -181,7 +180,7 @@ MemoryTranslation::operator+=(const MemoryTranslation &other) { Logger logger = logging.get("MemoryTranslation"); - /* Set level to debug to enable debug output */ + // Set level to debug to enable debug output logger->set_level(spdlog::level::info); const uintptr_t this_dst_high = this->dst + this->size; @@ -196,7 +195,7 @@ MemoryTranslation::operator+=(const MemoryTranslation &other) logger->debug("this_dst_high: {:#x}", this_dst_high); logger->debug("other_src_high: {:#x}", other_src_high); - /* Make sure there is a common memory area */ + // Make sure there is a common memory area assertExcept(other.src < this_dst_high, MemoryManager::InvalidTranslation()); assertExcept(this->dst < other_src_high, MemoryManager::InvalidTranslation()); @@ -217,25 +216,23 @@ MemoryTranslation::operator+=(const MemoryTranslation &other) logger->debug("diff_hi: {:#x}", diff_hi); logger->debug("diff_lo: {:#x}", diff_lo); - /* New size of aperture, can only stay or shrink */ + // New size of aperture, can only stay or shrink this->size = (hi - lo) - diff_hi - diff_lo; - /* New translation will come out other's destination (by default) */ + // New translation will come out other's destination (by default) this->dst = other.dst; - /* The source stays the same and can only increase with merged translations */ + // The source stays the same and can only increase with merged translations //this->src = this->src; if (otherSrcIsSmaller) - /* Other mapping starts at lower addresses, so we actually arrive at - * higher addresses - */ + // Other mapping starts at lower addresses, so we actually arrive at + // higher addresses this->dst += diff_lo; else - /* Other mapping starts at higher addresses than this, so we have to - * increase the start - * NOTE: for addresses equality, this just adds 0 - */ + // Other mapping starts at higher addresses than this, so we have to + // increase the start + // NOTE: for addresses equality, this just adds 0 this->src += diff_lo; logger->debug("result src: {:#x}", this->src); @@ -245,4 +242,4 @@ MemoryTranslation::operator+=(const MemoryTranslation &other) return *this; } -} /* namespace villas */ +} // namespace villas diff --git a/common/lib/popen.cpp b/common/lib/popen.cpp index 341178807..7b32de8c6 100644 --- a/common/lib/popen.cpp +++ b/common/lib/popen.cpp @@ -80,7 +80,7 @@ void Popen::open() goto clean_outpipe_out; if (pid == 0) { - /* Prepare arguments */ + // Prepare arguments if (shell) { argv.push_back((char *) "sh"); argv.push_back((char *) "-c"); @@ -94,7 +94,7 @@ void Popen::open() } } - /* Prepare environment */ + // Prepare environment for (char **p = environ; *p; p++) envp.push_back(*p); @@ -108,7 +108,7 @@ void Popen::open() argv.push_back(nullptr); envp.push_back(nullptr); - /* Redirect IO */ + // Redirect IO ::close(outpipe[READ]); ::close(inpipe[WRITE]); @@ -122,7 +122,7 @@ void Popen::open() ::close(outpipe[WRITE]); } - /* Change working directory */ + // Change working directory if (!working_dir.empty()) { int ret; @@ -205,5 +205,5 @@ int PopenStream::close() return ret; } -} /* namespace utils */ -} /* namespace villas */ +} // namespace utils +} // namespace villas diff --git a/common/lib/table.cpp b/common/lib/table.cpp index 31c7d32e8..3ad042f16 100644 --- a/common/lib/table.cpp +++ b/common/lib/table.cpp @@ -28,7 +28,7 @@ int Table::resize(int w) fixed = 0; total = width - columns.size() * 2; - /* Normalize width */ + // Normalize width for (unsigned i = 0; i < columns.size(); i++) { if (columns[i].width > 0) norm += columns[i].width; diff --git a/common/lib/task.cpp b/common/lib/task.cpp index dd5d24607..4b0b0ffd2 100644 --- a/common/lib/task.cpp +++ b/common/lib/task.cpp @@ -18,7 +18,7 @@ using namespace villas; #if PERIODIC_TASK_IMPL == TIMERFD #include -#endif /* PERIODIC_TASK_IMPL */ +#endif // PERIODIC_TASK_IMPL Task::Task(int clk) : clock(clk) @@ -31,7 +31,7 @@ Task::Task(int clk) : int ret = tsc_init(&tsc); if (ret) return ret; -#endif /* PERIODIC_TASK_IMPL */ +#endif // PERIODIC_TASK_IMPL } void Task::setTimeout(double to) @@ -62,8 +62,8 @@ void Task::setNext(const struct timespec *nxt) ret = timerfd_settime(fd, TFD_TIMER_ABSTIME, &its, nullptr); if (ret) throw SystemError("Failed to set timerfd"); - #endif /* PERIODIC_TASK_IMPL == TIMERFD */ -#endif /* PERIODIC_TASK_IMPL != RDTSC */ + #endif // PERIODIC_TASK_IMPL == TIMERFD +#endif // PERIODIC_TASK_IMPL != RDTSC } void Task::setRate(double rate) @@ -72,7 +72,7 @@ void Task::setRate(double rate) period = tsc_rate_to_cycles(&tsc, rate); next = tsc_now(&tsc) + period; #else - /* A rate of 0 will disarm the timer */ + // A rate of 0 will disarm the timer period = rate ? time_from_double(1.0 / rate) : (struct timespec) { 0, 0 }; #if PERIODIC_TASK_IMPL == CLOCK_NANOSLEEP || PERIODIC_TASK_IMPL == NANOSLEEP @@ -93,8 +93,8 @@ void Task::setRate(double rate) ret = timerfd_settime(fd, 0, &its, nullptr); if (ret) throw SystemError("Failed to set timerfd"); - #endif /* PERIODIC_TASK_IMPL */ -#endif /* PERIODIC_TASK_IMPL == RDTSC */ + #endif // PERIODIC_TASK_IMPL +#endif // PERIODIC_TASK_IMPL == RDTSC } Task::~Task() @@ -175,7 +175,7 @@ void Task::stop() ret = timerfd_settime(fd, 0, &its, nullptr); if (ret) throw SystemError("Failed to disarm timerfd"); -#endif /* PERIODIC_TASK_IMPL == TIMERFD */ +#endif // PERIODIC_TASK_IMPL == TIMERFD } int Task::getFD() const diff --git a/common/lib/terminal.cpp b/common/lib/terminal.cpp index 4954ba4bb..46ebf2fdf 100644 --- a/common/lib/terminal.cpp +++ b/common/lib/terminal.cpp @@ -37,7 +37,7 @@ Terminal::Terminal() if (ret) throw SystemError("Failed to register signal handler"); - /* Try to get initial terminal dimensions */ + // Try to get initial terminal dimensions ret = ioctl(STDERR_FILENO, TIOCGWINSZ, &window); if (ret) logger->warn("Failed to get terminal dimensions"); @@ -45,7 +45,7 @@ Terminal::Terminal() logger->info("stderr is not associated with a terminal! Using fallback values for window size..."); } - /* Fallback if for some reason we can not determine a prober window size */ + // Fallback if for some reason we can not determine a prober window size if (window.ws_col == 0) window.ws_col = 150; diff --git a/common/lib/tool.cpp b/common/lib/tool.cpp index 02f795ae9..1e1e6b27e 100644 --- a/common/lib/tool.cpp +++ b/common/lib/tool.cpp @@ -54,10 +54,10 @@ int Tool::run() if (ret) throw RuntimeError("Failed to initialize signal subsystem"); - /* Parse command line arguments */ + // Parse command line arguments parse(); - /* Run tool */ + // Run tool ret = main(); logger->info(CLR_GRN("Goodbye!")); diff --git a/common/lib/utils.cpp b/common/lib/utils.cpp index ecbc1036f..bbb1c9b6c 100644 --- a/common/lib/utils.cpp +++ b/common/lib/utils.cpp @@ -49,11 +49,11 @@ std::vector tokenize(std::string s, const std::string &delimiter) const size_t tokenLength = curentPos - lastPos; tokens.push_back(s.substr(lastPos, tokenLength)); - /* Advance in string */ + // Advance in string lastPos = curentPos + delimiter.length(); } - /* Check if there's a last token behind the last delimiter. */ + // Check if there's a last token behind the last delimiter. if (lastPos != s.length()) { const size_t lastTokenLength = s.length() - lastPos; tokens.push_back(s.substr(lastPos, lastTokenLength)); @@ -85,7 +85,7 @@ ssize_t readRandom(char *buf, size_t len) return bytes; } -/* Setup exit handler */ +// Setup exit handler int signalsInit(void (*cb)(int signal, siginfo_t *sinfo, void *ctx), std::list cbSignals, std::list ignoreSignals) { int ret; @@ -161,7 +161,7 @@ char * decolor(char *str) void killme(int sig) { - /* Send only to main thread in case the ID was initilized by signalsInit() */ + // Send only to main thread in case the ID was initilized by signalsInit() if (main_thread) pthread_kill(main_thread, sig); else @@ -174,7 +174,7 @@ double boxMuller(float m, float s) static double y2; static int use_last = 0; - if (use_last) { /* use value from previous call */ + if (use_last) { // Use value from previous call y1 = y2; use_last = 0; } @@ -282,14 +282,14 @@ size_t strlenp(const char *str) else if (c[0] == '\b') sz--; else if (c[0] == '\t') - sz += 4; /* tab width == 4 */ - /* CSI sequence */ + sz += 4; // Tab width == 4 + // CSI sequence else if (c[0] == '\e' && c[1] == '[') { c += 2; while (*c && *c != 'm') c++; } - /* UTF-8 */ + // UTF-8 else if (c[0] >= 0xc2 && c[0] <= 0xdf) { sz++; c += 1; @@ -374,5 +374,5 @@ bool isPrivileged() { return true; } -} /* namespace utils */ -} /* namespace villas */ +} // namespace utils +} // namespace villas diff --git a/common/lib/uuid.cpp b/common/lib/uuid.cpp index c01f4e82a..71172ef41 100644 --- a/common/lib/uuid.cpp +++ b/common/lib/uuid.cpp @@ -20,12 +20,12 @@ int villas::uuid::generateFromString(uuid_t out, const std::string &data, const if (!ret) return -1; - /* Namespace */ + // Namespace ret = EVP_DigestUpdate(c, (unsigned char *) ns.c_str(), ns.size()); if (!ret) return -1; - /* Data */ + // Data ret = EVP_DigestUpdate(c, (unsigned char *) data.c_str(), data.size()); if (!ret) return -1; @@ -48,12 +48,12 @@ int villas::uuid::generateFromString(uuid_t out, const std::string &data, const if (!ret) return -1; - /* Namespace */ + // Namespace ret = EVP_DigestUpdate(c, (unsigned char *) ns, 16); if (!ret) return -1; - /* Data */ + // Data ret = EVP_DigestUpdate(c, (unsigned char *) data.c_str(), data.size()); if (!ret) return -1; diff --git a/common/tests/unit/base64.cpp b/common/tests/unit/base64.cpp index 74ce205d2..f5fc51806 100644 --- a/common/tests/unit/base64.cpp +++ b/common/tests/unit/base64.cpp @@ -21,11 +21,6 @@ static std::vector vec(const char *str) return std::vector((byte *) str, (byte *) str + strlen(str)); } -// static std::string str(const std::vector &vec) -// { -// return std::string((char *) vec.data(), vec.size()); -// } - Test(base64, encoding) { cr_assert(encode(vec("pohy0Aiy1ZaVa5aik2yaiy3ifoh3oole")) == "cG9oeTBBaXkxWmFWYTVhaWsyeWFpeTNpZm9oM29vbGU="); diff --git a/common/tests/unit/graph.cpp b/common/tests/unit/graph.cpp index e284232f3..e4b25b907 100644 --- a/common/tests/unit/graph.cpp +++ b/common/tests/unit/graph.cpp @@ -74,7 +74,7 @@ Test(graph, path, .description = "Find path") g.addDefaultEdge(v1id, v2id); g.addDefaultEdge(v2id, v3id); - // create circular subgraph + // Create circular subgraph g.addDefaultEdge(v4id, v5id); g.addDefaultEdge(v5id, v4id); g.addDefaultEdge(v5id, v6id); diff --git a/common/tests/unit/kernel.cpp b/common/tests/unit/kernel.cpp index 20b34a19b..ac31c96f3 100644 --- a/common/tests/unit/kernel.cpp +++ b/common/tests/unit/kernel.cpp @@ -27,7 +27,7 @@ TestSuite(kernel, .description = "Kernel features"); #error "Unsupported architecture" #endif -/* This test is not portable, but we currently support x86 only */ +// This test is not portable, but we currently support x86 only Test(kernel, sizes) { int sz; @@ -91,7 +91,7 @@ Test(kernel, frequency) ret = get_cpu_frequency(&freq); cr_assert_eq(ret, 0); - /* Check for plausability only */ + // Check for plausability only cr_assert(freq > 1e9 && freq < 5e9); } #endif diff --git a/common/tests/unit/list.cpp b/common/tests/unit/list.cpp index 6ca5db839..1a990131f 100644 --- a/common/tests/unit/list.cpp +++ b/common/tests/unit/list.cpp @@ -33,13 +33,13 @@ Test(list, list_search) ret = list_init(&l); cr_assert_eq(ret, 0); - /* Fill list */ + // Fill list for (unsigned i = 0; i < ARRAY_LEN(nouns); i++) list_push(&l, (void *) nouns[i]); cr_assert_eq(list_length(&l), ARRAY_LEN(nouns)); - /* Declare on stack! */ + // Declare on stack! char positive[] = "woman"; char negative[] = "dinosaurrier"; diff --git a/common/tests/unit/timing.cpp b/common/tests/unit/timing.cpp index 1defa065f..c52f7c719 100644 --- a/common/tests/unit/timing.cpp +++ b/common/tests/unit/timing.cpp @@ -24,32 +24,32 @@ Test(timing, time_now) Test(timing, time_diff) { - struct timespec ts1 = { .tv_sec = 0, .tv_nsec = 1}; /* Value doesnt matter */ - struct timespec ts2 = { .tv_sec = 1, .tv_nsec = 0}; /* Overflow in nano seconds! */ + struct timespec ts1 = { .tv_sec = 0, .tv_nsec = 1}; // Value doesnt matter + struct timespec ts2 = { .tv_sec = 1, .tv_nsec = 0}; // Overflow in nano seconds! struct timespec ts3 = time_diff(&ts1, &ts2); - /* ts4 == ts2? */ + // ts4 == ts2? cr_assert_eq(ts3.tv_sec, 0); cr_assert_eq(ts3.tv_nsec, 999999999); } Test(timing, time_add) { - struct timespec ts1 = { .tv_sec = 1, .tv_nsec = 999999999}; /* Value doesnt matter */ - struct timespec ts2 = { .tv_sec = 1, .tv_nsec = 1}; /* Overflow in nano seconds! */ + struct timespec ts1 = { .tv_sec = 1, .tv_nsec = 999999999}; // Value doesnt matter + struct timespec ts2 = { .tv_sec = 1, .tv_nsec = 1}; // Overflow in nano seconds! struct timespec ts3 = time_add(&ts1, &ts2); - /* ts4 == ts2? */ + // ts4 == ts2? cr_assert_eq(ts3.tv_sec, 3); cr_assert_eq(ts3.tv_nsec, 0); } Test(timing, time_delta) { - struct timespec ts1 = { .tv_sec = 1, .tv_nsec = 123}; /* Value doesnt matter */ - struct timespec ts2 = { .tv_sec = 5, .tv_nsec = 246}; /* Overflow in nano seconds! */ + struct timespec ts1 = { .tv_sec = 1, .tv_nsec = 123}; // Value doesnt matter + struct timespec ts2 = { .tv_sec = 5, .tv_nsec = 246}; // Overflow in nano seconds! double delta = time_delta(&ts1, &ts2); diff --git a/common/tests/unit/utils.cpp b/common/tests/unit/utils.cpp index 9967c00fa..612b31416 100644 --- a/common/tests/unit/utils.cpp +++ b/common/tests/unit/utils.cpp @@ -18,7 +18,7 @@ using namespace villas::utils; // cppcheck-suppress unknownMacro TestSuite(utils, .description = "Utilities"); -/* Simple normality test for 1,2,3s intervals */ +// Simple normality test for 1,2,3s intervals Test(utils, box_muller) { double n; @@ -40,9 +40,9 @@ Test(utils, box_muller) (double) sigma[0] / iter); #endif - /* The random variable generated by the Box Muller transform is - * not an ideal normal distributed variable. - * The numbers from below are empirically measured. */ + // The random variable generated by the Box Muller transform is + // not an ideal normal distributed variable. + // The numbers from below are empirically measured. cr_assert_float_eq((double) sigma[2] / iter, 0.045527, 1e-2); cr_assert_float_eq((double) sigma[1] / iter, 0.271644, 1e-2); cr_assert_float_eq((double) sigma[0] / iter, 0.682829, 1e-2); @@ -101,7 +101,7 @@ Test(utils, cpuset) cset1.zero(); cr_assert(cset1.empty()); } -#endif /* __linux__ */ +#endif // __linux__ Test(utils, memdup) { @@ -120,11 +120,11 @@ Test(utils, memdup) Test(utils, is_aligned) { - /* Positive */ + // Positive cr_assert(IS_ALIGNED(1, 1)); cr_assert(IS_ALIGNED(128, 64)); - /* Negative */ + // Negative cr_assert(!IS_ALIGNED(55, 16)); cr_assert(!IS_ALIGNED(55, 55)); cr_assert(!IS_ALIGNED(1128, 256)); @@ -139,12 +139,12 @@ Test(utils, ceil) Test(utils, is_pow2) { - /* Positive */ + // Positive cr_assert(IS_POW2(1)); cr_assert(IS_POW2(2)); cr_assert(IS_POW2(64)); - /* Negative */ + // Negative cr_assert(!IS_POW2(0)); cr_assert(!IS_POW2(3)); cr_assert(!IS_POW2(11111)); @@ -192,7 +192,7 @@ Test(utils, sha1sum) unsigned char hash[SHA_DIGEST_LENGTH]; unsigned char expected[SHA_DIGEST_LENGTH] = { 0x69, 0xdf, 0x29, 0xdf, 0x1f, 0xf2, 0xd2, 0x5d, 0xb8, 0x68, 0x6c, 0x02, 0x8d, 0xdf, 0x40, 0xaf, 0xb3, 0xc1, 0xc9, 0x4d }; - /* Write the first 512 fibonaccia numbers to the file */ + // Write the first 512 fibonaccia numbers to the file for (int i = 0, a = 0, b = 1, c; i < 512; i++, a = b, b = c) { c = a + b;