diff options
author | Sergey Madaminov <sergey.madaminov@gmail.com> | 2021-09-15 16:32:19 -0500 |
---|---|---|
committer | Alin-Gabriel Serdean <aserdean@ovn.org> | 2021-10-12 18:07:04 +0300 |
commit | 13d05b8e5b10a7ef3dc3a17059c5c9a7acc68bdc (patch) | |
tree | 4b8b9e91c1e70aca7166fc09f52416891cdee50c /lib | |
parent | 7796253db660bc7a19ede3c733983ca42652c262 (diff) | |
download | openvswitch-13d05b8e5b10a7ef3dc3a17059c5c9a7acc68bdc.tar.gz |
sflow functions: fix unused parameter warnings for sflow functions
Several 'sflow' functions (sfl_poller_tick, sfl_sampler_tick, and
sfl_receiver_tick) have unused parameter 'now' in their signatures. This patch
removes that parameter from their signatures to fix compilation warnings.
Also, according to the 'utilities/checkpatch.py', there should be an indent
between 'for' keyword an opening left paren. Additionally, the line containing
'for' keyword had to end with an opening curly brace. Therefore, I did a bit of
formatting besides removing the unused parameter in the modified code.
Signed-off-by: Sergey Madaminov <sergey.madaminov@gmail.com>
Reviewed-by: Michael Santana <msantana@redhat.com>
Signed-off-by: Alin-Gabriel Serdean <aserdean@ovn.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sflow_agent.c | 12 | ||||
-rw-r--r-- | lib/sflow_api.h | 6 | ||||
-rw-r--r-- | lib/sflow_poller.c | 2 | ||||
-rw-r--r-- | lib/sflow_receiver.c | 2 | ||||
-rw-r--r-- | lib/sflow_sampler.c | 2 |
5 files changed, 15 insertions, 9 deletions
diff --git a/lib/sflow_agent.c b/lib/sflow_agent.c index 878c3da01..c95f654a5 100644 --- a/lib/sflow_agent.c +++ b/lib/sflow_agent.c @@ -129,14 +129,20 @@ void sfl_agent_tick(SFLAgent *agent, time_t now) SFLPoller *pl = agent->pollers; agent->now = now; /* samplers use ticks to decide when they are sampling too fast */ - for(; sm != NULL; sm = sm->nxt) sfl_sampler_tick(sm, now); + for (; sm != NULL; sm = sm->nxt) { + sfl_sampler_tick(sm); + } /* pollers use ticks to decide when to ask for counters */ - for(; pl != NULL; pl = pl->nxt) sfl_poller_tick(pl, now); + for (; pl != NULL; pl = pl->nxt) { + sfl_poller_tick(pl); + } /* receivers use ticks to flush send data. By doing this * step last we ensure that fresh counters polled during * sfl_poller_tick() above will be flushed promptly. */ - for(; rcv != NULL; rcv = rcv->nxt) sfl_receiver_tick(rcv, now); + for (; rcv != NULL; rcv = rcv->nxt) { + sfl_receiver_tick(rcv); + } } /*_________________---------------------------__________________ diff --git a/lib/sflow_api.h b/lib/sflow_api.h index 7264fc1c5..a0530b37a 100644 --- a/lib/sflow_api.h +++ b/lib/sflow_api.h @@ -323,9 +323,9 @@ void sfl_sampler_init(SFLSampler *sampler, SFLAgent *agent, SFLDataSource_instan void sfl_poller_init(SFLPoller *poller, SFLAgent *agent, SFLDataSource_instance *pdsi, void *magic, getCountersFn_t getCountersFn); -void sfl_receiver_tick(SFLReceiver *receiver, time_t now); -void sfl_poller_tick(SFLPoller *poller, time_t now); -void sfl_sampler_tick(SFLSampler *sampler, time_t now); +void sfl_receiver_tick(SFLReceiver *receiver); +void sfl_poller_tick(SFLPoller *poller); +void sfl_sampler_tick(SFLSampler *sampler); int sfl_receiver_writeFlowSample(SFLReceiver *receiver, SFL_FLOW_SAMPLE_TYPE *fs); int sfl_receiver_writeCountersSample(SFLReceiver *receiver, SFL_COUNTERS_SAMPLE_TYPE *cs); diff --git a/lib/sflow_poller.c b/lib/sflow_poller.c index d2e415521..9e6a487bc 100644 --- a/lib/sflow_poller.c +++ b/lib/sflow_poller.c @@ -125,7 +125,7 @@ void sfl_poller_resetCountersSeqNo(SFLPoller *poller) { poller->countersSampleS -----------------___________________________------------------ */ -void sfl_poller_tick(SFLPoller *poller, time_t now) +void sfl_poller_tick(SFLPoller *poller) { if(poller->countersCountdown == 0) return; /* counters retrieval was not enabled */ if(poller->sFlowCpReceiver == 0) return; diff --git a/lib/sflow_receiver.c b/lib/sflow_receiver.c index cde1359c4..4162518e3 100644 --- a/lib/sflow_receiver.c +++ b/lib/sflow_receiver.c @@ -141,7 +141,7 @@ void sfl_receiver_set_sFlowRcvrPort(SFLReceiver *receiver, u_int32_t sFlowRcvrPo -----------------___________________________------------------ */ -void sfl_receiver_tick(SFLReceiver *receiver, time_t now) +void sfl_receiver_tick(SFLReceiver *receiver) { // if there are any samples to send, flush them now if(receiver->sampleCollector.numSamples > 0) sendSample(receiver); diff --git a/lib/sflow_sampler.c b/lib/sflow_sampler.c index 7406cc94a..b8cb5ac4a 100644 --- a/lib/sflow_sampler.c +++ b/lib/sflow_sampler.c @@ -107,7 +107,7 @@ void sfl_sampler_resetFlowSeqNo(SFLSampler *sampler) { sampler->flowSampleSeqNo -----------------___________________________------------------ */ -void sfl_sampler_tick(SFLSampler *sampler, time_t now) +void sfl_sampler_tick(SFLSampler *sampler) { if(sampler->backoffThreshold && sampler->samplesThisTick > sampler->backoffThreshold) { /* automatic backoff. If using hardware sampling then this is where you have to |