mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
io: renamed formats (msg -> villas-binary, villas -> villas-human)
This commit is contained in:
parent
24e371215a
commit
6922e273bb
13 changed files with 17 additions and 17 deletions
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include <string.h>
|
||||
|
||||
#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 = {
|
|
@ -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 = {
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue