wip

Author: steffen-vogel-opalrt

doc/openapi/components/schemas/formats/edgeflex.yaml

@@ -34,9 +34,9 @@ additionalProperties:
 
 example:
 - created: 1633791645123
-  signal0: 123.456
-  signal1: true
-  signal2: 1234
-  signal3:
+  signal_0: 123.456
+  signal_1: true
+  signal_2: 1234
+  signal_3:
     real: 1234.4556
     imag: 23232.12312

doc/openapi/paths/nodes.yaml

@@ -41,28 +41,28 @@ get:
                     signals:
                       - type: float
                         enabled: true
-                        name: signal0
+                        name: signal_0
                       - type: float
                         enabled: true
-                        name: signal1
+                        name: signal_1
                       - type: float
                         enabled: true
-                        name: signal2
+                        name: signal_2
                       - type: float
                         enabled: true
-                        name: signal3
+                        name: signal_3
                   out:
                     vectorize: 2
                     signals:
                       - type: float
                         enabled: true
-                        name: signal0
+                        name: signal_0
                       - type: float
                         enabled: true
-                        name: signal1
+                        name: signal_1
                       - type: float
                         enabled: true
-                        name: signal2
+                        name: signal_2
                   type: websocket
                   vectorize: 2
                   series:

etc/examples/nodes/opal_orchestra.conf

@@ -74,7 +74,6 @@ nodes = {
 
                     orchestra_name = "pub_signal_float"
                     orchestra_type = "float64"
-                    orchestra_index = 0
                 },
                 {
                     name = "pub_signal2"
@@ -83,7 +82,7 @@ nodes = {
                     orchestra_name = "pub_signal_float"
                     orchestra_type = "float64"
                 },
-                { name = "signal_float", orchestra_name = "some_bus/signal_float", orchestra_type = "float64", orchestra_index = 2 },
+                { name = "signal_float", orchestra_name = "some_bus/signal_float", orchestra_type = "float64" },
                 { name = "signal_bool", orchestra_name = "some_bus/signal_bool", orchestra_type = "boolean" },
                 { name = "signal_uint8", orchestra_name = "some_bus/some_nested_bus/signal_uint8", orchestra_type = "unsigned int8" },
                 { name = "signal_uint8_2", orchestra_type = "unsigned int8" }

etc/examples/typhoon.conf

@@ -21,11 +21,11 @@ nodes = {
             )
 
             signals = (
-                { name = "signal0", type="float" },
-                { name = "signal1", type="integer" },
-                { name = "signal2", type="boolean" },
-                { name = "signal3", type="float" },
-                { name = "signal4", type="complex" }
+                { name = "signal_0", type="float" },
+                { name = "signal_1", type="integer" },
+                { name = "signal_2", type="boolean" },
+                { name = "signal_3", type="float" },
+                { name = "signal_4", type="complex" }
             )
         }
 

include/villas/node.hpp

@@ -109,9 +109,9 @@ class Node {
 
   int parseCommon(
       json_t *json,
-      std::function<Signal::Ptr(json_t *, NodeDirection::Direction)>
-          parse_signal = [](json_t *j, NodeDirection::Direction d) {
-            return Signal::fromJson(j);
+      std::function<Signal::Ptr(json_t *json, NodeDirection::Direction dir, unsigned index)>
+          parse_signal = [](json_t *json, NodeDirection::Direction dir, unsigned index) {
+            return Signal::fromJson(json);
           });
 
 public:

include/villas/node/config.hpp.in

@@ -16,7 +16,7 @@
 #define DEFAULT_SAMPLE_LENGTH 64u
 #define DEFAULT_QUEUE_LENGTH 1024u
 #define MAX_SAMPLE_LENGTH 512u
-#define DEFAULT_FORMAT_BUFFER_LENGTH 4096u
+#define DEFAULT_FORMAT_BUFFER_LENGTH (4096u*1024u)
 
 /* Number of hugepages which are requested from the the kernel.
  * @see https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt

include/villas/node_direction.hpp

@@ -52,7 +52,7 @@ class NodeDirection {
 
   NodeDirection(enum NodeDirection::Direction dir, Node *n);
 
-  int parse(json_t *json, std::function<Signal::Ptr(json_t *)> parse_signal);
+  int parse(json_t *json, std::function<Signal::Ptr(json_t *json, unsigned index)> parse_signal);
   void check();
   int prepare();
   int start();

include/villas/nodes/nanomsg.hpp

@@ -16,9 +16,6 @@ namespace node {
 // Forward declarations
 class NodeCompat;
 
-// The maximum length of a packet which contains stuct msg.
-#define NANOMSG_MAX_PACKET_LEN 1500
-
 struct nanomsg {
   struct {
     int socket;

include/villas/nodes/socket.hpp

@@ -17,8 +17,7 @@ namespace node {
 // Forward declarations
 class NodeCompat;
 
-// The maximum length of a packet which contains stuct msg.
-#define SOCKET_INITIAL_BUFFER_LEN (64 * 1024)
+#define SOCKET_INITIAL_BUFFER_LEN DEFAULT_FORMAT_BUFFER_LENGTH
 
 struct Socket {
   int sd;     // The socket descriptor

include/villas/signal.hpp

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+#include <optional>
 
 #include <jansson.h>
 
@@ -35,6 +36,8 @@ class Signal {
   union SignalData init; // The initial value of the signal.
   enum SignalType type;
 
+  Signal::Ptr previous; // Previous signal in vector.
+
   // Initialize a signal with default values.
   Signal(const std::string &n = "", const std::string &u = "",
          enum SignalType t = SignalType::INVALID);
@@ -47,8 +50,6 @@ class Signal {
   // Produce JSON representation of signal.
   virtual json_t *toJson() const;
 
-  bool isNext(const Signal &sig);
-
   static Signal::Ptr fromJson(json_t *json);
 };