aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/idhash.c44
-rw-r--r--src/core/idhash.h20
-rw-r--r--src/core/pipe.c1
-rw-r--r--src/protocol/reqrep/rep.c29
-rw-r--r--src/protocol/survey/respond.c29
5 files changed, 67 insertions, 56 deletions
diff --git a/src/core/idhash.c b/src/core/idhash.c
index 9f3b4b03..b3974983 100644
--- a/src/core/idhash.c
+++ b/src/core/idhash.c
@@ -1,5 +1,6 @@
//
-// Copyright 2016 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
@@ -17,9 +18,26 @@ struct nni_idhash_entry {
void * ihe_val;
};
+struct nni_idhash {
+ size_t ih_cap;
+ size_t ih_count;
+ size_t ih_load;
+ size_t ih_minload; // considers placeholders
+ size_t ih_maxload;
+ uint32_t ih_walkers;
+ uint32_t ih_minval;
+ uint32_t ih_maxval;
+ uint32_t ih_dynval;
+ nni_idhash_entry *ih_entries;
+};
+
int
-nni_idhash_init(nni_idhash *h)
+nni_idhash_init(nni_idhash **hp)
{
+ nni_idhash *h;
+ if ((h = NNI_ALLOC_STRUCT(h)) == NULL) {
+ return (NNG_ENOMEM);
+ }
h->ih_entries = NULL;
h->ih_count = 0;
h->ih_load = 0;
@@ -30,18 +48,22 @@ nni_idhash_init(nni_idhash *h)
h->ih_minval = 0;
h->ih_maxval = 0xffffffff;
h->ih_dynval = 0;
+ *hp = h;
return (0);
}
void
nni_idhash_fini(nni_idhash *h)
{
- NNI_ASSERT(h->ih_walkers == 0);
- if (h->ih_entries != NULL) {
- nni_free(h->ih_entries, h->ih_cap * sizeof(nni_idhash_entry));
- h->ih_entries = NULL;
- h->ih_cap = h->ih_count = 0;
- h->ih_load = h->ih_minload = h->ih_maxload = 0;
+ if (h != NULL) {
+ NNI_ASSERT(h->ih_walkers == 0);
+ if (h->ih_entries != NULL) {
+ NNI_FREE_STRUCTS(h->ih_entries, h->ih_cap);
+ h->ih_entries = NULL;
+ h->ih_cap = h->ih_count = 0;
+ h->ih_load = h->ih_minload = h->ih_maxload = 0;
+ }
+ NNI_FREE_STRUCT(h);
}
}
@@ -50,7 +72,7 @@ nni_idhash_reclaim(nni_idhash *h)
{
// Reclaim the buffer if we want, but preserve the limits.
if ((h->ih_count == 0) && (h->ih_cap != 0) && (h->ih_walkers == 0)) {
- nni_free(h->ih_entries, h->ih_cap * sizeof(nni_idhash_entry));
+ NNI_FREE_STRUCTS(h->ih_entries, h->ih_cap);
h->ih_cap = 0;
h->ih_entries = NULL;
h->ih_minload = 0;
@@ -124,7 +146,7 @@ nni_hash_resize(nni_idhash *h)
}
oldents = h->ih_entries;
- newents = nni_alloc(sizeof(nni_idhash_entry) * newsize);
+ newents = NNI_ALLOC_STRUCTS(newents, newsize);
if (newents == NULL) {
return (NNG_ENOMEM);
}
@@ -157,7 +179,7 @@ nni_hash_resize(nni_idhash *h)
}
}
if (oldsize != 0) {
- nni_free(oldents, sizeof(nni_idhash_entry) * oldsize);
+ NNI_FREE_STRUCTS(oldents, oldsize);
}
return (0);
}
diff --git a/src/core/idhash.h b/src/core/idhash.h
index bb3b1581..018420bc 100644
--- a/src/core/idhash.h
+++ b/src/core/idhash.h
@@ -1,5 +1,6 @@
//
-// Copyright 2016 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
@@ -25,21 +26,6 @@
typedef struct nni_idhash nni_idhash;
typedef struct nni_idhash_entry nni_idhash_entry;
-// The details of the nni_idhash are "private". But they let us inline
-// this into structures.
-struct nni_idhash {
- size_t ih_cap;
- size_t ih_count;
- size_t ih_load;
- size_t ih_minload; // considers placeholders
- size_t ih_maxload;
- uint32_t ih_walkers;
- uint32_t ih_minval;
- uint32_t ih_maxval;
- uint32_t ih_dynval;
- nni_idhash_entry *ih_entries;
-};
-
// nni_idhash_walkfn is called when walking a hash table. If the
// return value is non-zero, then nni_idhash_walk will terminate further
// process and return that return value. The function takes the generic
@@ -48,7 +34,7 @@ struct nni_idhash {
// Note that the walkfn must not attempt to change the hash table.
// The user must provide any locking needed.
typedef int (*nni_idhash_walkfn)(void *, uint32_t, void *);
-extern int nni_idhash_init(nni_idhash *);
+extern int nni_idhash_init(nni_idhash **);
extern void nni_idhash_fini(nni_idhash *);
extern void nni_idhash_reclaim(nni_idhash *);
extern void nni_idhash_set_limits(nni_idhash *, uint32_t, uint32_t, uint32_t);
diff --git a/src/core/pipe.c b/src/core/pipe.c
index 702e8eb1..91b78192 100644
--- a/src/core/pipe.c
+++ b/src/core/pipe.c
@@ -1,5 +1,6 @@
//
// Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c
index cfc83a5b..d37ca691 100644
--- a/src/protocol/reqrep/rep.c
+++ b/src/protocol/reqrep/rep.c
@@ -1,5 +1,6 @@
//
// Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
@@ -28,16 +29,16 @@ static void nni_rep_pipe_fini(void *);
// An nni_rep_sock is our per-socket protocol private structure.
struct nni_rep_sock {
- nni_sock * sock;
- nni_msgq * uwq;
- nni_msgq * urq;
- int raw;
- int ttl;
- nni_idhash pipes;
- char * btrace;
- size_t btrace_len;
- nni_aio aio_getq;
- nni_mtx mtx;
+ nni_sock * sock;
+ nni_msgq * uwq;
+ nni_msgq * urq;
+ int raw;
+ int ttl;
+ nni_idhash *pipes;
+ char * btrace;
+ size_t btrace_len;
+ nni_aio aio_getq;
+ nni_mtx mtx;
};
// An nni_rep_pipe is our per-pipe protocol private structure.
@@ -59,7 +60,7 @@ nni_rep_sock_fini(void *arg)
nni_rep_sock *rep = arg;
nni_aio_fini(&rep->aio_getq);
- nni_idhash_fini(&rep->pipes);
+ nni_idhash_fini(rep->pipes);
if (rep->btrace != NULL) {
nni_free(rep->btrace, rep->btrace_len);
}
@@ -183,7 +184,7 @@ nni_rep_pipe_start(void *arg)
rp->id = nni_pipe_id(rp->pipe);
nni_mtx_lock(&rep->mtx);
- rv = nni_idhash_insert(&rep->pipes, rp->id, rp);
+ rv = nni_idhash_insert(rep->pipes, rp->id, rp);
nni_mtx_unlock(&rep->mtx);
if (rv != 0) {
return (rv);
@@ -214,7 +215,7 @@ nni_rep_pipe_stop(void *arg)
if (id != 0) {
nni_mtx_lock(&rep->mtx);
- nni_idhash_remove(&rep->pipes, id);
+ nni_idhash_remove(rep->pipes, id);
nni_mtx_unlock(&rep->mtx);
}
}
@@ -260,7 +261,7 @@ nni_rep_sock_getq_cb(void *arg)
// (nonblocking) if we can. If we can't for any reason, then we
// free the message.
nni_mtx_lock(&rep->mtx);
- rv = nni_idhash_find(&rep->pipes, id, (void **) &rp);
+ rv = nni_idhash_find(rep->pipes, id, (void **) &rp);
nni_mtx_unlock(&rep->mtx);
if (rv == 0) {
rv = nni_msgq_tryput(rp->sendq, msg);
diff --git a/src/protocol/survey/respond.c b/src/protocol/survey/respond.c
index 6a784738..17018155 100644
--- a/src/protocol/survey/respond.c
+++ b/src/protocol/survey/respond.c
@@ -1,5 +1,6 @@
//
// Copyright 2017 Garrett D'Amore <garrett@damore.org>
+// Copyright 2017 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
@@ -28,16 +29,16 @@ static void nni_resp_pipe_fini(void *);
// An nni_resp_sock is our per-socket protocol private structure.
struct nni_resp_sock {
- nni_sock * nsock;
- nni_msgq * urq;
- nni_msgq * uwq;
- int raw;
- int ttl;
- nni_idhash pipes;
- char * btrace;
- size_t btrace_len;
- nni_aio aio_getq;
- nni_mtx mtx;
+ nni_sock * nsock;
+ nni_msgq * urq;
+ nni_msgq * uwq;
+ int raw;
+ int ttl;
+ nni_idhash *pipes;
+ char * btrace;
+ size_t btrace_len;
+ nni_aio aio_getq;
+ nni_mtx mtx;
};
// An nni_resp_pipe is our per-pipe protocol private structure.
@@ -59,7 +60,7 @@ nni_resp_sock_fini(void *arg)
if (psock != NULL) {
nni_aio_fini(&psock->aio_getq);
- nni_idhash_fini(&psock->pipes);
+ nni_idhash_fini(psock->pipes);
if (psock->btrace != NULL) {
nni_free(psock->btrace, psock->btrace_len);
}
@@ -180,7 +181,7 @@ nni_resp_pipe_start(void *arg)
ppipe->id = nni_pipe_id(ppipe->npipe);
nni_mtx_lock(&psock->mtx);
- rv = nni_idhash_insert(&psock->pipes, ppipe->id, ppipe);
+ rv = nni_idhash_insert(psock->pipes, ppipe->id, ppipe);
nni_mtx_unlock(&psock->mtx);
if (rv != 0) {
return (rv);
@@ -206,7 +207,7 @@ nni_resp_pipe_stop(void *arg)
nni_mtx_lock(&psock->mtx);
if (ppipe->id != 0) {
- nni_idhash_remove(&psock->pipes, ppipe->id);
+ nni_idhash_remove(psock->pipes, ppipe->id);
ppipe->id = 0;
}
nni_mtx_unlock(&psock->mtx);
@@ -246,7 +247,7 @@ nni_resp_sock_getq_cb(void *arg)
nni_msg_trim_header(msg, 4);
nni_mtx_lock(&psock->mtx);
- rv = nni_idhash_find(&psock->pipes, id, (void **) &ppipe);
+ rv = nni_idhash_find(psock->pipes, id, (void **) &ppipe);
if (rv != 0) {
nni_msg_free(msg);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 16:37:42 +0000