diff --git a/etc/infiniband.conf b/etc/infiniband.conf index cc861e4e6..1ed4830e4 100644 --- a/etc/infiniband.conf +++ b/etc/infiniband.conf @@ -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 = ( diff --git a/include/villas/nodes/infiniband.h b/include/villas/nodes/infiniband.h index 3061cd727..969382a70 100644 --- a/include/villas/nodes/infiniband.h +++ b/include/villas/nodes/infiniband.h @@ -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; }; diff --git a/lib/nodes/infiniband.c b/lib/nodes/infiniband.c index 9c6633db0..70d277ba9 100644 --- a/lib/nodes/infiniband.c +++ b/lib/nodes/infiniband.c @@ -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); }