diff options
| author | JaylinYu <64823539+JaylinYu@users.noreply.github.com> | 2020-11-13 16:01:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 00:01:40 -0800 |
| commit | 7c1ff5ed1e48af413494b9070cccf79f3858b749 (patch) | |
| tree | 3211220d47e5319a13666850c529e6029ccf0617 /src/core | |
| parent | 6545ba68696e5a09f0b36f2ea5b60a83b0f88b8b (diff) | |
| download | nng-7c1ff5ed1e48af413494b9070cccf79f3858b749.tar.gz nng-7c1ff5ed1e48af413494b9070cccf79f3858b749.tar.bz2 nng-7c1ff5ed1e48af413494b9070cccf79f3858b749.zip | |
*Fix Add missing #define when disabling NNG_ENABLE_STATS (#1342)
Co-authored-by: Jaylin <oblivionangel@sina.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/pipe.c | 6 | ||||
| -rw-r--r-- | src/core/socket.c | 4 | ||||
| -rw-r--r-- | src/core/stats.c | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/core/pipe.c b/src/core/pipe.c index 8ba35b2b..4e767605 100644 --- a/src/core/pipe.c +++ b/src/core/pipe.c @@ -385,10 +385,16 @@ nni_pipe_dialer_id(nni_pipe *p) return (p->p_dialer ? nni_dialer_id(p->p_dialer) : 0); } + void nni_pipe_add_stat(nni_pipe *p, nni_stat_item *item) { +#ifdef NNG_ENABLE_STATS nni_stat_add(&p->st_root, item); +#else + NNI_ARG_UNUSED(p); + NNI_ARG_UNUSED(item); +#endif } void diff --git a/src/core/socket.c b/src/core/socket.c index 11b1371e..72c55c7a 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -668,11 +668,13 @@ nni_sock_open(nni_sock **sockp, const nni_proto *proto) // Set the socket name. (void) snprintf(s->s_name, sizeof(s->s_name), "%u", s->s_id); +#ifdef NNG_ENABLE_STATS // Set up basic stat values. nni_stat_set_id(&s->st_id, s->s_id); // Add our stats chain. nni_stat_register(&s->st_root); +#endif return (0); } @@ -1603,7 +1605,9 @@ nni_listener_add_pipe(nni_listener *l, void *tpipe) return; } nni_mtx_unlock(&s->s_mx); +#ifdef NNG_ENABLE_STATS nni_stat_register(&p->st_root); +#endif nni_pipe_run_cb(p, NNG_PIPE_EV_ADD_POST); nni_pipe_rele(p); } diff --git a/src/core/stats.c b/src/core/stats.c index 14cf7978..85e7d030 100644 --- a/src/core/stats.c +++ b/src/core/stats.c @@ -162,7 +162,7 @@ nni_stat_set_bool(nni_stat_item *item, bool b) item->si_value.sv_bool = b; #else NNI_ARG_UNUSED(item); - NNI_ARG_UNUSED(id); + NNI_ARG_UNUSED(b); #endif } @@ -192,8 +192,8 @@ nni_stat_set_string(nni_stat_item *item, const char *s) nni_strfree(old); #else - NNG_ARG_UNUSED(item); - NNG_ARG_UNUSED(s); + NNI_ARG_UNUSED(item); + NNI_ARG_UNUSED(s); #endif } @@ -207,7 +207,7 @@ nni_stat_set_value(nni_stat_item *item, uint64_t v) item->si_value.sv_number = v; } #else - NNI_ARG_UNUSED(stat); + NNI_ARG_UNUSED(item); NNI_ARG_UNUSED(v); #endif } |