diff options
| author | Timo Dritschler <timo.dritschler@kit.edu> | 2014-11-26 18:18:31 +0100 |
|---|---|---|
| committer | Timo Dritschler <timo.dritschler@kit.edu> | 2014-11-26 18:18:31 +0100 |
| commit | 3dc2e76f0d6cf350f41c574726d354f1a81591a6 (patch) | |
| tree | 4ee3812e3c56f6f0fe00ad1080b973253b7f9b96 | |
| parent | cea4dee2c9d257d65a2a5f07ea6e85d43634aa68 (diff) | |
| parent | 8d6149084c6c66dc0514021264128bb2a2458930 (diff) | |
| download | kiro-3dc2e76f0d6cf350f41c574726d354f1a81591a6.tar.gz kiro-3dc2e76f0d6cf350f41c574726d354f1a81591a6.tar.bz2 kiro-3dc2e76f0d6cf350f41c574726d354f1a81591a6.tar.xz kiro-3dc2e76f0d6cf350f41c574726d354f1a81591a6.zip | |
Merge branch 'master' into eventLoops
| -rw-r--r-- | src/kiro-client.c | 10 | ||||
| -rw-r--r-- | src/kiro-server.c | 8 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/kiro-client.c b/src/kiro-client.c index 8618c46..06026eb 100644 --- a/src/kiro-client.c +++ b/src/kiro-client.c @@ -205,16 +205,6 @@ kiro_client_connect (KiroClient *self, const char *address, const char *port) return -1; } - ctx->cf_mr_send = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem)); - ctx->cf_mr_recv = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem)); - - if (!ctx->cf_mr_recv || !ctx->cf_mr_send) { - g_critical ("Failed to allocate Control Flow Memory Container (Out of memory?)"); - kiro_destroy_connection_context (&ctx); - rdma_destroy_ep (priv->conn); - return -1; - } - ctx->cf_mr_recv = kiro_create_rdma_memory (priv->conn->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE); ctx->cf_mr_send = kiro_create_rdma_memory (priv->conn->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE); diff --git a/src/kiro-server.c b/src/kiro-server.c index a236c30..e4a5bb6 100644 --- a/src/kiro-server.c +++ b/src/kiro-server.c @@ -135,14 +135,6 @@ connect_client (struct rdma_cm_id *client) return -1; } - ctx->cf_mr_send = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem)); - ctx->cf_mr_recv = (struct kiro_rdma_mem *)calloc (1, sizeof (struct kiro_rdma_mem)); - - if (!ctx->cf_mr_recv || !ctx->cf_mr_send) { - g_critical ("Failed to allocate Control Flow Memory Container"); - goto error; - } - ctx->cf_mr_recv = kiro_create_rdma_memory (client->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE); ctx->cf_mr_send = kiro_create_rdma_memory (client->pd, sizeof (struct kiro_ctrl_msg), IBV_ACCESS_LOCAL_WRITE); |