diff --git a/include/villas/io/msg.h b/include/villas/io/villas_binary.h similarity index 100% rename from include/villas/io/msg.h rename to include/villas/io/villas_binary.h diff --git a/include/villas/io/villas.h b/include/villas/io/villas_human.h similarity index 100% rename from include/villas/io/villas.h rename to include/villas/io/villas_human.h diff --git a/lib/io/msg.c b/lib/io/villas_binary.c similarity index 98% rename from lib/io/msg.c rename to lib/io/villas_binary.c index cfc2028f8..a56bcead3 100644 --- a/lib/io/msg.c +++ b/lib/io/villas_binary.c @@ -22,7 +22,7 @@ #include -#include "io/msg.h" +#include "io/villas_binary.h" #include "io/msg_format.h" #include "sample.h" #include "utils.h" @@ -199,7 +199,7 @@ int msg_sscan(char *buf, size_t len, size_t *rbytes, struct sample *smps[], unsi } static struct plugin p1 = { - .name = "msg", + .name = "villas-binary", .description = "VILLAS binary network format", .type = PLUGIN_TYPE_IO, .io = { @@ -212,7 +212,7 @@ static struct plugin p1 = { /** The WebSocket node-type usually uses little endian byte order intead of network byte order */ static struct plugin p2 = { - .name = "webmsg", + .name = "villas-web", .description = "VILLAS binary network format for WebSockets", .type = PLUGIN_TYPE_IO, .io = { diff --git a/lib/io/villas.c b/lib/io/villas_human.c similarity index 99% rename from lib/io/villas.c rename to lib/io/villas_human.c index b2c614eec..61a8116c8 100644 --- a/lib/io/villas.c +++ b/lib/io/villas_human.c @@ -29,7 +29,7 @@ #include "utils.h" #include "timing.h" #include "sample.h" -#include "io/villas.h" +#include "io/villas_human.h" size_t villas_sprint_single(char *buf, size_t len, struct sample *s, int flags) { @@ -262,7 +262,7 @@ int villas_open(struct io *io, const char *uri) } static struct plugin p = { - .name = "villas", + .name = "villas-human", .description = "VILLAS human readable format", .type = PLUGIN_TYPE_IO, .io = { diff --git a/lib/nodes/file.c b/lib/nodes/file.c index 8fef1736e..2f02efc0c 100644 --- a/lib/nodes/file.c +++ b/lib/nodes/file.c @@ -79,7 +79,7 @@ int file_parse(struct node *n, json_t *cfg) json_error_t err; const char *uri_tmpl = NULL; - const char *format = "villas"; + const char *format = "villas-human"; const char *eof = NULL; const char *epoch_mode = NULL; double epoch_flt = 0; diff --git a/lib/nodes/nanomsg.c b/lib/nodes/nanomsg.c index af5372fb9..7c59944c1 100644 --- a/lib/nodes/nanomsg.c +++ b/lib/nodes/nanomsg.c @@ -82,7 +82,7 @@ int nanomsg_parse(struct node *n, json_t *cfg) int ret; struct nanomsg *m = n->_vd; - const char *format = "villas"; + const char *format = "villas-human"; json_error_t err; diff --git a/lib/nodes/socket.c b/lib/nodes/socket.c index 7415328ac..afcf84d5d 100644 --- a/lib/nodes/socket.c +++ b/lib/nodes/socket.c @@ -382,7 +382,7 @@ int socket_parse(struct node *n, json_t *cfg) const char *local, *remote; const char *layer = NULL; - const char *format = "msg"; + const char *format = "villas-binary"; int ret; diff --git a/lib/nodes/test_rtt.c b/lib/nodes/test_rtt.c index 6da4b7415..4a896cac7 100644 --- a/lib/nodes/test_rtt.c +++ b/lib/nodes/test_rtt.c @@ -66,7 +66,7 @@ int test_rtt_parse(struct node *n, json_t *cfg) int ret, numrates, numvalues, limit = 1000; int *rates, *values; - const char *format = "villas"; + const char *format = "villas-human"; const char *output = "."; size_t index; @@ -238,7 +238,7 @@ int test_rtt_write(struct node *n, struct sample *smps[], unsigned cnt) int test_rtt_fd(struct node *n) { struct test_rtt *t = n->_vd; - + return task_fd(&t->task); } diff --git a/lib/nodes/zeromq.c b/lib/nodes/zeromq.c index 720d8c3cd..57a73cef5 100644 --- a/lib/nodes/zeromq.c +++ b/lib/nodes/zeromq.c @@ -98,7 +98,7 @@ int zeromq_parse(struct node *n, json_t *cfg) const char *ep = NULL; const char *type = NULL; const char *filter = NULL; - const char *format = "villas"; + const char *format = "villas-human"; size_t index; json_t *cfg_pub = NULL; diff --git a/src/hook.c b/src/hook.c index a0dcd652e..da555d270 100644 --- a/src/hook.c +++ b/src/hook.c @@ -106,7 +106,7 @@ static void usage() int main(int argc, char *argv[]) { int ret, recv; - char *format = "villas"; + char *format = "villas-human"; /* Default values */ cnt = 1; diff --git a/src/pipe.c b/src/pipe.c index 2b0cb258b..44052f704 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -206,7 +206,7 @@ int main(int argc, char *argv[]) { int ret, level = V, timeout = 0; bool reverse = false; - char *format = "villas"; + char *format = "villas-human"; sendd = recvv = (struct dir) { .enabled = true, diff --git a/src/signal.c b/src/signal.c index 2543b8759..2dc7f646a 100644 --- a/src/signal.c +++ b/src/signal.c @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) int ret; struct plugin *p; - char *format = "villas"; /** @todo hardcoded for now */ + char *format = "villas-human"; /** @todo hardcoded for now */ ret = log_init(&l, l.level, LOG_ALL); if (ret) diff --git a/tests/unit/io.c b/tests/unit/io.c index 323e1fec0..63fd26438 100644 --- a/tests/unit/io.c +++ b/tests/unit/io.c @@ -51,10 +51,10 @@ static char formats[][32] = { "raw-int64-le", "raw-flt32", "raw-flt64", - "villas", + "villas-human", + "villas-binary", "csv", "json", - "msg", "gtnet", "gtnet-fake" }; @@ -232,7 +232,7 @@ ParameterizedTest(char *fmt, io, highlevel) #if 0 /* Show the file contents */ char cmd[128]; - if (!strcmp(fmt, "json") || !strcmp(fmt, "villas")) + if (!strcmp(fmt, "json") || !strcmp(fmt, "villas-human")) snprintf(cmd, sizeof(cmd), "cat %s", fn); else snprintf(cmd, sizeof(cmd), "hexdump -C %s", fn);