nodes: convert C-style header files to C++ style headers

2025-03-09 00:00:00 +01:00 · 2019-04-23 00:12:31 +02:00 · 2019-04-23 00:12:31 +02:00 · 30fb71d8eb
commit 30fb71d8eb
parent 6cecdf4b81
47 changed files with 41 additions and 196 deletions
--- a/include/villas/nodes/amqp.hpp
+++ b/include/villas/nodes/amqp.hpp
@ -35,10 +35,6 @@
 #include <villas/list.h>
 #include <villas/io.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct format_type;

@ -85,8 +81,4 @@ int amqp_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
 /** @see node_type::write */
 int amqp_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/comedi.hpp
+++ b/include/villas/nodes/comedi.hpp
@ -35,10 +35,6 @@
 #include <villas/list.h>
 #include <villas/timing.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 // whether to use read() or mmap() kernel interface
 #define COMEDI_USE_READ (1)
 //#define COMEDI_USE_READ (0)
@ -103,7 +99,3 @@ int comedi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r
 int comedi_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/file.hpp
+++ b/include/villas/nodes/file.hpp
@ -33,10 +33,6 @@
 #include <villas/node.h>
 #include <villas/task.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define FILE_MAX_PATHLEN	512

 struct file {
@ -91,7 +87,3 @@ int file_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
 int file_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/iec61850.hpp
+++ b/include/villas/nodes/iec61850.hpp
@ -45,10 +45,6 @@
 #include <villas/list.h>
 #include <villas/signal.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum iec61850_type {
 	/* According to IEC 61850-7-2 */
 	BOOLEAN,
@ -120,8 +116,4 @@ int iec61850_receiver_stop(struct iec61850_receiver *r);

 int iec61850_receiver_destroy(struct iec61850_receiver *r);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/iec61850_sv.hpp
+++ b/include/villas/nodes/iec61850_sv.hpp
@ -38,11 +38,7 @@
 #include <villas/pool.h>
 #include <villas/node.h>
 #include <villas/list.h>
-#include <villas/nodes/iec61850.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <villas/nodes/iec61850.hpp>

 struct iec61850_sv {
 	char *interface;
@ -108,8 +104,4 @@ int iec61850_sv_write(struct node *n, struct sample *smps[], unsigned cnt, unsig
 /** @see node_type::fd */
 int iec61850_sv_fd(struct node *n);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/infiniband.hpp
+++ b/include/villas/nodes/infiniband.hpp
--- a/include/villas/nodes/influxdb.hpp
+++ b/include/villas/nodes/influxdb.hpp
@ -31,10 +31,6 @@

 #include <villas/list.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct node;
 struct sample;
@ -67,8 +63,4 @@ int influxdb_close(struct node *n);
 /** @see node_type::write */
 int influxdb_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/loopback.hpp
+++ b/include/villas/nodes/loopback.hpp
@ -32,10 +32,6 @@
 #include <villas/queue_signalled.h>
 #include <villas/pool.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct node;
 struct sample;
@ -68,8 +64,4 @@ int loopback_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned
 /** @see node_type::write */
 int loopback_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/mqtt.hpp
+++ b/include/villas/nodes/mqtt.hpp
@ -34,10 +34,6 @@
 #include <villas/io.h>
 #include <villas/queue_signalled.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct format_type;
 struct mosquitto;
@ -100,8 +96,4 @@ int mqtt_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
 /** @see node_type::write */
 int mqtt_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/nanomsg.hpp
+++ b/include/villas/nodes/nanomsg.hpp
@ -33,10 +33,6 @@
 #include <villas/list.h>
 #include <villas/io.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** The maximum length of a packet which contains stuct msg. */
 #define NANOMSG_MAX_PACKET_LEN 1500

@ -71,8 +67,4 @@ int nanomsg_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *
 /** @see node_type::write */
 int nanomsg_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/ngsi.hpp
+++ b/include/villas/nodes/ngsi.hpp
@ -42,10 +42,6 @@
 #include <villas/node.h>
 #include <villas/task.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct node;

@ -99,7 +95,3 @@ int ngsi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel
 int ngsi_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/opal.hpp
+++ b/include/villas/nodes/opal.hpp
@ -41,10 +41,6 @@
 #include "AsyncApi.h"
 #include "OpalGenAsyncParamCtrl.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct opal {
 	int reply;
 	int mode;
@ -89,8 +85,4 @@ int opal_read(struct node *n, struct sample *smps[], unsigned cnt);
 /** @see node_type::write */
 int opal_write(struct node *n, struct sample *smps[], unsigned cnt);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/rtp.hpp
+++ b/include/villas/nodes/rtp.hpp
@ -34,10 +34,6 @@

 #include <fstream>

-extern "C" {
-#include <re/re_sa.h>
-}
-
 #include <villas/node.h>
 #include <villas/list.h>
 #include <villas/log.hpp>
@ -47,6 +43,11 @@ extern "C" {
 #include <villas/hooks/decimate.hpp>
 #include <villas/dsp/pid.hpp>

+extern "C" {
+  #include <re/re_sa.h>
+  #include <re/re_rtp.h>
+}
+
 /* Forward declarations */
 struct format_type;

@ -104,8 +105,6 @@ struct rtp {
 	struct mbuf *send_mb;
 };

-extern "C" {
-
 /** @see node_type::print */
 char * rtp_print(struct node *n);

@ -124,6 +123,4 @@ int rtp_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rele
 /** @see node_type::write */
 int rtp_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-}
-
 /** @} */
--- a/include/villas/nodes/shmem.hpp
+++ b/include/villas/nodes/shmem.hpp
@ -36,10 +36,6 @@
 #include <villas/node/config.h>
 #include <villas/shmem.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** Node-type for shared memory communication.
 * @see node_type
 */
@ -70,7 +66,3 @@ int shmem_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
 int shmem_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/signal_generator.hpp
+++ b/include/villas/nodes/signal_generator.hpp
@ -32,10 +32,6 @@
 #include <villas/timing.h>
 #include <villas/task.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct node;
 struct sample;
@ -92,7 +88,3 @@ int signal_generator_stop(struct node *n);
 int signal_generator_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/socket.hpp
+++ b/include/villas/nodes/socket.hpp
@ -34,10 +34,6 @@
 #include <villas/socket_addr.h>
 #include <villas/io.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct format_type;

@ -94,7 +90,3 @@ int socket_parse(struct node *n, json_t *cfg);
 char * socket_print(struct node *n);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/stats.hpp
+++ b/include/villas/nodes/stats.hpp
@ -35,10 +35,6 @@
 #include <villas/task.h>
 #include <villas/list.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct node;
 struct sample;
@ -80,8 +76,4 @@ int stats_node_stop(struct node *n);
 /** @see node_type::read */
 int stats_node_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/test_rtt.hpp
+++ b/include/villas/nodes/test_rtt.hpp
@ -33,10 +33,6 @@
 #include <villas/io.h>
 #include <villas/task.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct test_rtt;
 struct node;
@ -86,7 +82,3 @@ int test_rtt_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned
 int test_rtt_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/uldaq.hpp
+++ b/include/villas/nodes/uldaq.hpp
@ -35,10 +35,6 @@
 #include <villas/queue_signalled.h>
 #include <villas/pool.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <uldaq.h>

 #define ULDAQ_MAX_DEV_COUNT 100
@ -75,8 +71,4 @@ struct uldaq {
 	} out;
 };

-#ifdef __cplusplus
-}
-#endif
-
 /** @} */
--- a/include/villas/nodes/websocket.hpp
+++ b/include/villas/nodes/websocket.hpp
@ -37,10 +37,6 @@
 #include <villas/io.h>
 #include <villas/node/config.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define DEFAULT_WEBSOCKET_QUEUE_LENGTH	(DEFAULT_QUEUE_LENGTH * 64)
 #define DEFAULT_WEBSOCKET_SAMPLE_LENGTH	DEFAULT_SAMPLE_LENGTH

@ -117,7 +113,3 @@ int websocket_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned
 int websocket_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/include/villas/nodes/zeromq.hpp
+++ b/include/villas/nodes/zeromq.hpp
@ -35,10 +35,6 @@
 #include <villas/list.h>
 #include <villas/io.h>

-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if ZMQ_BUILD_DRAFT_API && (ZMQ_VERSION_MAJOR > 4 || (ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2))
  #define ZMQ_BUILD_DISH 1
 #endif
@ -109,7 +105,3 @@ int zeromq_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r
 int zeromq_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release);

 /** @} */
-
-#ifdef __cplusplus
-}
-#endif
--- a/lib/kernel/if.cpp
+++ b/lib/kernel/if.cpp
@ -36,7 +36,7 @@
 #include <villas/kernel/nl.h>
 #include <villas/kernel/kernel.h>

-#include <villas/nodes/socket.h>
+#include <villas/nodes/socket.hpp>

 int if_init(struct interface *i, struct rtnl_link *link)
 {
--- a/lib/memory/ib.cpp
+++ b/lib/memory/ib.cpp
@ -22,7 +22,7 @@

 #include <rdma/rdma_cma.h>

-#include <villas/nodes/infiniband.h>
+#include <villas/nodes/infiniband.hpp>
 #include <villas/memory.h>
 #include <villas/utils.h>
 #include <villas/memory/ib.h>
--- a/lib/nodes/amqp.cpp
+++ b/lib/nodes/amqp.cpp
@ -26,7 +26,7 @@
 #include <amqp_tcp_socket.h>

 #include <villas/plugin.h>
-#include <villas/nodes/amqp.h>
+#include <villas/nodes/amqp.hpp>
 #include <villas/utils.h>
 #include <villas/format_type.h>

--- a/lib/nodes/comedi.cpp
+++ b/lib/nodes/comedi.cpp
@ -28,7 +28,7 @@
 #include <comedi_errno.h>

 #include <villas/plugin.h>
-#include <villas/nodes/comedi.h>
+#include <villas/nodes/comedi.hpp>
 #include <villas/utils.h>

 /* Utility functions to dump a comedi_cmd graciously taken from comedilib demo */
--- a/lib/nodes/file.cpp
+++ b/lib/nodes/file.cpp
@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <errno.h>

-#include <villas/nodes/file.h>
+#include <villas/nodes/file.hpp>
 #include <villas/utils.h>
 #include <villas/timing.h>
 #include <villas/queue.h>
--- a/lib/nodes/iec61850.cpp
+++ b/lib/nodes/iec61850.cpp
@ -26,7 +26,7 @@
 #include <pthread.h>
 #include <unistd.h>

-#include <villas/nodes/iec61850_sv.h>
+#include <villas/nodes/iec61850_sv.hpp>
 #include <villas/plugin.h>
 #include <villas/signal.h>

--- a/lib/nodes/iec61850_sv.cpp
+++ b/lib/nodes/iec61850_sv.cpp
@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <unistd.h>

-#include <villas/nodes/iec61850_sv.h>
+#include <villas/nodes/iec61850_sv.hpp>
 #include <villas/plugin.h>

 #define CONFIG_SV_DEFAULT_APPID 0x4000
--- a/lib/nodes/infiniband.cpp
+++ b/lib/nodes/infiniband.cpp
@ -25,7 +25,7 @@
 #include <netdb.h>

 #include <villas/node/config.h>
-#include <villas/nodes/infiniband.h>
+#include <villas/nodes/infiniband.hpp>
 #include <villas/plugin.h>
 #include <villas/utils.h>
 #include <villas/format_type.h>
--- a/lib/nodes/influxdb.cpp
+++ b/lib/nodes/influxdb.cpp
@ -30,7 +30,7 @@
 #include <villas/plugin.h>
 #include <villas/signal.h>
 #include <villas/node/config.h>
-#include <villas/nodes/influxdb.h>
+#include <villas/nodes/influxdb.hpp>
 #include <villas/memory.h>

 int influxdb_parse(struct node *n, json_t *json)
--- a/lib/nodes/loopback.cpp
+++ b/lib/nodes/loopback.cpp
@ -25,7 +25,7 @@
 #include <villas/node.h>
 #include <villas/plugin.h>
 #include <villas/node/config.h>
-#include <villas/nodes/loopback.h>
+#include <villas/nodes/loopback.hpp>
 #include <villas/memory.h>

 int loopback_parse(struct node *n, json_t *cfg)
--- a/lib/nodes/mqtt.cpp
+++ b/lib/nodes/mqtt.cpp
@ -23,7 +23,7 @@
 #include <string.h>
 #include <mosquitto.h>

-#include <villas/nodes/mqtt.h>
+#include <villas/nodes/mqtt.hpp>
 #include <villas/plugin.h>
 #include <villas/utils.h>
 #include <villas/format_type.h>
--- a/lib/nodes/nanomsg.cpp
+++ b/lib/nodes/nanomsg.cpp
@ -25,7 +25,7 @@
 #include <string.h>

 #include <villas/plugin.h>
-#include <villas/nodes/nanomsg.h>
+#include <villas/nodes/nanomsg.hpp>
 #include <villas/utils.h>
 #include <villas/format_type.h>

--- a/lib/nodes/ngsi.cpp
+++ b/lib/nodes/ngsi.cpp
@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <unistd.h>

-#include <villas/nodes/ngsi.h>
+#include <villas/nodes/ngsi.hpp>
 #include <villas/utils.h>
 #include <villas/timing.h>
 #include <villas/plugin.h>
--- a/lib/nodes/opal.cpp
+++ b/lib/nodes/opal.cpp
@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <math.h>

-#include <villas/nodes/opal.h>
+#include <villas/nodes/opal.hpp>
 #include <villas/utils.h>
 #include <villas/plugin.h>

--- a/lib/nodes/rtp.cpp
+++ b/lib/nodes/rtp.cpp
@ -27,20 +27,20 @@
 #include <time.h>
 #include <signal.h>

+#include <villas/nodes/rtp.hpp>
+
 extern "C" {
-#include <re/re_types.h>
-#include <re/re_main.h>
-#include <re/re_mbuf.h>
-#include <re/re_mem.h>
-#include <re/re_rtp.h>
-#include <re/re_sys.h>
-#include <re/re_udp.h>
-#undef ALIGN_MASK
+  #include <re/re_main.h>
+  #include <re/re_types.h>
+  #include <re/re_mbuf.h>
+  #include <re/re_mem.h>
+  #include <re/re_sys.h>
+  #include <re/re_udp.h>
+  #undef ALIGN_MASK
 }

 #include <villas/plugin.h>
-#include <villas/nodes/socket.h>
-#include <villas/nodes/rtp.hpp>
+#include <villas/nodes/socket.hpp>
 #include <villas/utils.h>
 #include <villas/stats.h>
 #include <villas/hook.h>
--- a/lib/nodes/shmem.cpp
+++ b/lib/nodes/shmem.cpp
@ -31,7 +31,7 @@
 #include <villas/kernel/kernel.h>
 #include <villas/log.h>
 #include <villas/shmem.h>
-#include <villas/nodes/shmem.h>
+#include <villas/nodes/shmem.hpp>
 #include <villas/plugin.h>
 #include <villas/timing.h>
 #include <villas/utils.h>
--- a/lib/nodes/signal_generator.cpp
+++ b/lib/nodes/signal_generator.cpp
@ -26,7 +26,7 @@

 #include <villas/node.h>
 #include <villas/plugin.h>
-#include <villas/nodes/signal_generator.h>
+#include <villas/nodes/signal_generator.hpp>

 static enum signal_generator::type signal_generator_lookup_type(const char *type)
 {
--- a/lib/nodes/socket.cpp
+++ b/lib/nodes/socket.cpp
@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 #include <netinet/ip.h>

-#include <villas/nodes/socket.h>
+#include <villas/nodes/socket.hpp>
 #include <villas/utils.h>
 #include <villas/format_type.h>
 #include <villas/sample.h>
--- a/lib/nodes/test_rtt.cpp
+++ b/lib/nodes/test_rtt.cpp
@ -29,7 +29,7 @@
 #include <villas/sample.h>
 #include <villas/timing.h>
 #include <villas/plugin.h>
-#include <villas/nodes/test_rtt.h>
+#include <villas/nodes/test_rtt.hpp>

 static struct plugin p;

--- a/lib/nodes/uldaq.cpp
+++ b/lib/nodes/uldaq.cpp
@ -27,7 +27,7 @@
 #include <villas/node.h>
 #include <villas/plugin.h>
 #include <villas/config.h>
-#include <villas/nodes/uldaq.h>
+#include <villas/nodes/uldaq.hpp>
 #include <villas/memory.h>

 static unsigned num_devs = ULDAQ_MAX_DEV_COUNT;
--- a/lib/nodes/websocket.cpp
+++ b/lib/nodes/websocket.cpp
@ -32,7 +32,7 @@
 #include <villas/utils.h>
 #include <villas/buffer.h>
 #include <villas/plugin.h>
-#include <villas/nodes/websocket.h>
+#include <villas/nodes/websocket.hpp>
 #include <villas/format_type.h>
 #include <villas/formats/msg_format.h>
 #include <villas/super_node.h>
--- a/lib/nodes/zeromq.cpp
+++ b/lib/nodes/zeromq.cpp
@ -27,7 +27,7 @@
  #include <zmq_utils.h>
 #endif

-#include <villas/nodes/zeromq.h>
+#include <villas/nodes/zeromq.hpp>
 #include <villas/node.h>
 #include <villas/utils.h>
 #include <villas/queue.h>
--- a/lib/web.cpp
+++ b/lib/web.cpp
@ -31,7 +31,7 @@
 #include <villas/api/sessions/http.hpp>
 #include <villas/api/sessions/websocket.hpp>

-#include <villas/nodes/websocket.h>
+#include <villas/nodes/websocket.hpp>

 using namespace villas;
 using namespace villas::node;
--- a/src/villas-node.cpp
+++ b/src/villas-node.cpp
@ -47,7 +47,7 @@
 #include <villas/kernel/rt.hpp>

 #ifdef ENABLE_OPAL_ASYNC
-  #include <villas/nodes/opal.h>
+  #include <villas/nodes/opal.hpp>
 #endif

 using namespace villas;
--- a/src/villas-pipe.cpp
+++ b/src/villas-pipe.cpp
@ -47,7 +47,7 @@
 #include <villas/kernel/rt.hpp>
 #include <villas/exceptions.hpp>
 #include <villas/format_type.h>
-#include <villas/nodes/websocket.h>
+#include <villas/nodes/websocket.hpp>

 using namespace villas;
 using namespace villas::node;
--- a/src/villas-signal.cpp
+++ b/src/villas-signal.cpp
@ -40,7 +40,7 @@
 #include <villas/node.h>
 #include <villas/pool.h>
 #include <villas/plugin.h>
-#include <villas/nodes/signal_generator.h>
+#include <villas/nodes/signal_generator.hpp>

 using namespace villas;