Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

Removed obsolete BUSY/EVENT flag from Infiniband node

Browse source
This commit is contained in:
Dennis Potter 2018-10-14 01:54:54 +02:00
parent ed3a27fefd
commit 1328f190ad
3 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/infiniband.conf
View file

@ -33,7 +33,6 @@ nodes = {
vectorize = 1,
poll_mode = "BUSY",
buffer_subtraction = 128,
},
@ -66,7 +65,6 @@ nodes = {
vectorize = 1,
poll_mode = "BUSY",
buffer_subtraction = 128,
hooks = (

8
include/villas/nodes/infiniband.h
View file

@ -41,12 +41,6 @@
#define META_GRH_SIZE META_SIZE + GRH_SIZE
#define CHK_PER_ITER 2048
/* Enums */
enum poll_mode_e {
EVENT,
BUSY
};
struct infiniband {
/* IBV/RDMA CM structs */
struct context_s {
@ -111,8 +105,6 @@ struct infiniband {
} conn;
/* Misc settings */
enum poll_mode_e poll_mode;
int is_source;
};

17
lib/nodes/infiniband.c
View file

@ -185,7 +185,6 @@ int ib_parse(struct node *n, json_t *cfg)
char *local = NULL;
char *remote = NULL;
const char *transport_mode = "RC";
const char *poll_mode = "BUSY";
int timeout = 1000;
int recv_cq_size = 128;
int send_cq_size = 128;
@ -213,9 +212,8 @@ int ib_parse(struct node *n, json_t *cfg)
if (json_in) {
ret = json_unpack_ex(json_in, &err, 0, "{ s?: s, s?: s, s?: i, s?: i, s?: i, s?: i}",
ret = json_unpack_ex(json_in, &err, 0, "{ s?: s, s?: i, s?: i, s?: i, s?: i}",
"address", &local,
"poll_mode", &poll_mode,
"cq_size", &recv_cq_size,
"max_wrs", &max_recv_wr,
"vectorize", &vectorize_in,
@ -303,17 +301,6 @@ int ib_parse(struct node *n, json_t *cfg)
debug(LOG_IB | 4, "Set timeout to %i in node %s", timeout, node_name(n));
// Translate poll mode
if (strcmp(poll_mode, "EVENT") == 0)
ib->poll_mode = EVENT;
else if (strcmp(poll_mode, "BUSY") == 0)
ib->poll_mode = BUSY;
else
error("Failed to translate poll_mode in node %s. %s is not a valid \
poll mode!", node_name(n), poll_mode);
debug(LOG_IB | 4, "Set poll mode to %s in node %s", poll_mode, node_name(n));
// Set completion queue size
ib->recv_cq_size = recv_cq_size;
ib->send_cq_size = send_cq_size;
@ -874,6 +861,8 @@ int ib_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *relea
smps[j]->length = SAMPLE_NUMBER_OF_VALUES(wc[j].byte_len - correction);
smps[j]->ts.received = ts_receive;
printf("time_ns: %lu\n", smps[j]->sequence);
smps[j]->flags = (SAMPLE_HAS_TS_ORIGIN | SAMPLE_HAS_TS_RECEIVED | SAMPLE_HAS_SEQUENCE);
}