mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 00:05:15 +00:00
Code Issues Releases Wiki Activity

sflow functions: fix unused parameter warnings for sflow functions

Browse Source 
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>
This commit is contained in:
Sergey Madaminov
2021-09-15 16:32:19 -05:00
committed by Alin-Gabriel Serdean
parent 7796253db6
commit 13d05b8e5b
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/sflow_agent.c
View File

@@ -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);
}
}
/*_________________---------------------------__________________

6
lib/sflow_api.h
View File

@@ -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);

2
lib/sflow_poller.c
View File

@@ -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;

2
lib/sflow_receiver.c
View File

@@ -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);

2
lib/sflow_sampler.c
View File

@@ -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