diff options
| author | Garrett D'Amore <garrett@damore.org> | 2021-12-06 21:09:55 -0500 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2021-12-06 21:09:55 -0500 |
| commit | 037d26a902a3cd5016052c76a6747e40c1a0df50 (patch) | |
| tree | f76ed1eabcffa862d93ffe6ee3d53c6a0ae472c4 /src/core/socket.c | |
| parent | 21528dfe0998d056222191a4abe53d8d9f1286e3 (diff) | |
| download | nng-037d26a902a3cd5016052c76a6747e40c1a0df50.tar.gz nng-037d26a902a3cd5016052c76a6747e40c1a0df50.tar.bz2 nng-037d26a902a3cd5016052c76a6747e40c1a0df50.zip | |
ID map static initialization support.
This also arranges to clean up the maps at nng_fini time.
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index d9ac12b6..a8850b5d 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -101,10 +101,10 @@ struct nni_socket { #endif }; -static nni_list sock_list = NNI_LIST_INITIALIZER(sock_list, nni_sock, s_node); -static nni_mtx sock_lk = NNI_MTX_INITIALIZER; -static nni_id_map sock_ids; -static nni_id_map ctx_ids; +static nni_list sock_list = NNI_LIST_INITIALIZER(sock_list, nni_sock, s_node); +static nni_mtx sock_lk = NNI_MTX_INITIALIZER; +static nni_id_map sock_ids = NNI_ID_MAP_INITIALIZER(1, 0x7fffffff, 0); +static nni_id_map ctx_ids = NNI_ID_MAP_INITIALIZER(1, 0x7fffffff, 0); static void nni_ctx_destroy(nni_ctx *); @@ -607,20 +607,6 @@ nni_sock_create(nni_sock **sp, const nni_proto *proto) return (rv); } -void -nni_sock_sys_init(void) -{ - nni_id_map_init(&sock_ids, 1, 0x7fffffff, false); - nni_id_map_init(&ctx_ids, 1, 0x7fffffff, false); -} - -void -nni_sock_sys_fini(void) -{ - nni_id_map_fini(&sock_ids); - nni_id_map_fini(&ctx_ids); -} - int nni_sock_open(nni_sock **sockp, const nni_proto *proto) { |