aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaning: fix warning when building with clang.

Browse Source 
clang was issuing some warnings related to unused return in function.
This patch adds some needed error treatment and ignore the rest of the
warnings by adding a cast to void.
remotes/origin/HEAD
Eric Leblond 14 years ago committed by Victor Julien
parent 6efd37a388
commit 0227a87fcb
23 changed files with 109 additions and 90 deletions
Show Stats Download Patch File Download Diff File

8
src/counters.c
Unescape Escape View File

@ -442,7 +442,9 @@ static void *SCPerfMgmtThread(void *arg)
struct timespec cond_time;
/* Set the thread name */
SCSetThreadName(tv_local->name);
if (SCSetThreadName(tv_local->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Set the threads capability */
tv_local->cap_flags = 0;
@ -501,7 +503,9 @@ static void *SCPerfWakeupThread(void *arg)
struct timespec cond_time;
/* Set the thread name */
SCSetThreadName(tv_local->name);
if (SCSetThreadName(tv_local->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Set the threads capability */
tv_local->cap_flags = 0;

34
src/detect-engine-tag.c
Unescape Escape View File

@ -134,7 +134,7 @@ int TagFlowAdd(Packet *p, DetectTagDataEntry *tde) {
if (new_tde != NULL) {
new_tde->next = p->flow->tag_list;
p->flow->tag_list = new_tde;
SC_ATOMIC_ADD(num_tags, 1);
(void) SC_ATOMIC_ADD(num_tags, 1);
}
} else if (num_tags == DETECT_TAG_MAX_TAGS) {
SCLogDebug("Max tags for sessions reached (%"PRIu16")", num_tags);
@ -178,7 +178,7 @@ int TagHashAddTag(DetectTagDataEntry *tde, Packet *p)
DetectTagDataEntry *new_tde = DetectTagDataCopy(tde);
if (new_tde != NULL) {
host->tag = new_tde;
SC_ATOMIC_ADD(num_tags, 1);
(void) SC_ATOMIC_ADD(num_tags, 1);
}
} else {
/* Append the tag to the list of this host */
@ -208,7 +208,7 @@ int TagHashAddTag(DetectTagDataEntry *tde, Packet *p)
/* get a new tde as the one we have is on the stack */
DetectTagDataEntry *new_tde = DetectTagDataCopy(tde);
if (new_tde != NULL) {
SC_ATOMIC_ADD(num_tags, 1);
(void) SC_ATOMIC_ADD(num_tags, 1);
new_tde->next = host->tag;
host->tag = new_tde;
@ -258,14 +258,14 @@ static void TagHandlePacketFlow(Flow *f, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
p->flow->tag_list = iter->next;
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
}
} else if (flag_added == 0) {
@ -283,14 +283,14 @@ static void TagHandlePacketFlow(Flow *f, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
p->flow->tag_list = iter->next;
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
}
} else if (flag_added == 0) {
@ -310,14 +310,14 @@ static void TagHandlePacketFlow(Flow *f, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
p->flow->tag_list = iter->next;
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
}
} else if (flag_added == 0) {
@ -371,13 +371,13 @@ void TagHandlePacketHost(Host *host, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
host->tag = iter;
continue;
}
@ -396,13 +396,13 @@ void TagHandlePacketHost(Host *host, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
host->tag = iter;
continue;
}
@ -423,13 +423,13 @@ void TagHandlePacketHost(Host *host, Packet *p) {
prev->next = iter->next;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
continue;
} else {
tde = iter;
iter = iter->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
host->tag = iter;
continue;
}
@ -527,7 +527,7 @@ int TagTimeoutCheck(Host *host, struct timeval *tv)
tmp = tde->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
} else {
host->tag = tmp->next;
@ -535,7 +535,7 @@ int TagTimeoutCheck(Host *host, struct timeval *tv)
tmp = tde->next;
SCFree(tde);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
}
}
return retval;

2
src/detect-tag.c
Unescape Escape View File

@ -336,7 +336,7 @@ void DetectTagDataListFree(void *ptr) {
while (entry != NULL) {
DetectTagDataEntry *next_entry = entry->next;
DetectTagDataEntryFree(entry);
SC_ATOMIC_SUB(num_tags, 1);
(void) SC_ATOMIC_SUB(num_tags, 1);
entry = next_entry;
}
}

2
src/flow-hash.c
Unescape Escape View File

@ -633,7 +633,7 @@ static Flow *FlowGetUsedFlow(void) {
FLOWLOCK_UNLOCK(f);
SC_ATOMIC_ADD(flow_prune_idx, (flow_config.hash_size - cnt));
(void) SC_ATOMIC_ADD(flow_prune_idx, (flow_config.hash_size - cnt));
return f;
}

7
src/flow-manager.c
Unescape Escape View File

@ -423,8 +423,11 @@ void *FlowManagerThread(void *td)
FlowForceReassemblySetup();
/* set the thread name */
SCSetThreadName(th_v->name);
SCLogDebug("%s started...", th_v->name);
if (SCSetThreadName(th_v->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
} else {
SCLogDebug("%s started...", th_v->name);
}
th_v->sc_perf_pca = SCPerfGetAllCountersArray(&th_v->sc_perf_pctx);
SCPerfAddToClubbedTMTable(th_v->name, &th_v->sc_perf_pctx);

6
src/flow-util.c
Unescape Escape View File

@ -53,11 +53,11 @@ Flow *FlowAlloc(void)
return NULL;
}
SC_ATOMIC_ADD(flow_memuse, sizeof(Flow));
(void) SC_ATOMIC_ADD(flow_memuse, sizeof(Flow));
f = SCMalloc(sizeof(Flow));
if (f == NULL) {
SC_ATOMIC_SUB(flow_memuse, sizeof(Flow));
(void) SC_ATOMIC_SUB(flow_memuse, sizeof(Flow));
return NULL;
}
@ -76,7 +76,7 @@ void FlowFree(Flow *f)
FLOW_DESTROY(f);
SCFree(f);
SC_ATOMIC_SUB(flow_memuse, sizeof(Flow));
(void) SC_ATOMIC_SUB(flow_memuse, sizeof(Flow));
}
/**

4
src/flow-util.h
Unescape Escape View File

@ -64,7 +64,7 @@
(f)->lnext = NULL; \
(f)->lprev = NULL; \
SC_ATOMIC_INIT((f)->autofp_tmqh_flow_qid); \
SC_ATOMIC_SET((f)->autofp_tmqh_flow_qid, -1); \
(void) SC_ATOMIC_SET((f)->autofp_tmqh_flow_qid, -1); \
RESET_COUNTERS((f)); \
} while (0)
@ -97,7 +97,7 @@
GenericVarFree((f)->flowvar); \
(f)->flowvar = NULL; \
if (SC_ATOMIC_GET((f)->autofp_tmqh_flow_qid) != -1) { \
SC_ATOMIC_SET((f)->autofp_tmqh_flow_qid, -1); \
(void) SC_ATOMIC_SET((f)->autofp_tmqh_flow_qid, -1); \
} \
RESET_COUNTERS((f)); \
} while(0)

8
src/flow.c
Unescape Escape View File

@ -182,7 +182,7 @@ void FlowIncrUsecnt(Flow *f)
if (f == NULL)
return;
SC_ATOMIC_ADD(f->use_cnt, 1);
(void) SC_ATOMIC_ADD(f->use_cnt, 1);
return;
}
/**
@ -195,7 +195,7 @@ void FlowDecrUsecnt(Flow *f)
if (f == NULL)
return;
SC_ATOMIC_SUB(f->use_cnt, 1);
(void) SC_ATOMIC_SUB(f->use_cnt, 1);
return;
}
@ -412,7 +412,7 @@ void FlowInitConfig(char quiet)
for (i = 0; i < flow_config.hash_size; i++) {
FBLOCK_INIT(&flow_hash[i]);
}
SC_ATOMIC_ADD(flow_memuse, (flow_config.hash_size * sizeof(FlowBucket)));
(void) SC_ATOMIC_ADD(flow_memuse, (flow_config.hash_size * sizeof(FlowBucket)));
if (quiet == FALSE) {
SCLogInfo("allocated %llu bytes of memory for the flow hash... "
@ -495,7 +495,7 @@ void FlowShutdown(void)
SCFree(flow_hash);
flow_hash = NULL;
}
SC_ATOMIC_SUB(flow_memuse, flow_config.hash_size * sizeof(FlowBucket));
(void) SC_ATOMIC_SUB(flow_memuse, flow_config.hash_size * sizeof(FlowBucket));
FlowQueueDestroy(&flow_spare_q);
SC_ATOMIC_DESTROY(flow_prune_idx);

26
src/host.c
Unescape Escape View File

@ -51,7 +51,7 @@ uint32_t HostSpareQueueGetSize(void) {
void HostMoveToSpare(Host *h) {
HostEnqueue(&host_spare_q, h);
SC_ATOMIC_SUB(host_counter, 1);
(void) SC_ATOMIC_SUB(host_counter, 1);
}
Host *HostAlloc(void) {
@ -59,7 +59,7 @@ Host *HostAlloc(void) {
return NULL;
}
SC_ATOMIC_ADD(host_memuse, sizeof(Host));
(void) SC_ATOMIC_ADD(host_memuse, sizeof(Host));
Host *h = SCMalloc(sizeof(Host));
if (h == NULL)
@ -81,7 +81,7 @@ void HostFree(Host *h) {
SCMutexDestroy(&h->m);
SCFree(h);
SC_ATOMIC_SUB(host_memuse, sizeof(Host));
(void) SC_ATOMIC_SUB(host_memuse, sizeof(Host));
}
}
@ -191,7 +191,7 @@ void HostInitConfig(char quiet)
for (i = 0; i < host_config.hash_size; i++) {
HRLOCK_INIT(&host_hash[i]);
}
SC_ATOMIC_ADD(host_memuse, (host_config.hash_size * sizeof(HostHashRow)));
(void) SC_ATOMIC_ADD(host_memuse, (host_config.hash_size * sizeof(HostHashRow)));
if (quiet == FALSE) {
SCLogInfo("allocated %llu bytes of memory for the host hash... "
@ -270,7 +270,7 @@ void HostShutdown(void)
SCFree(host_hash);
host_hash = NULL;
}
SC_ATOMIC_SUB(host_memuse, host_config.hash_size * sizeof(HostHashRow));
(void) SC_ATOMIC_SUB(host_memuse, host_config.hash_size * sizeof(HostHashRow));
HostQueueDestroy(&host_spare_q);
SC_ATOMIC_DESTROY(host_prune_idx);
@ -357,7 +357,7 @@ static Host *HostGetNew(Address *a) {
/* host is initialized (recylced) but *unlocked* */
}
SC_ATOMIC_ADD(host_counter, 1);
(void) SC_ATOMIC_ADD(host_counter, 1);
SCMutexLock(&h->m);
return h;
}
@ -369,11 +369,11 @@ static Host *HostGetNew(Address *a) {
void HostInit(Host *h, Address *a) {
COPY_ADDRESS(a, &h->a);
HostIncrUsecnt(h);
(void) HostIncrUsecnt(h);
}
void HostRelease(Host *h) {
HostDecrUsecnt(h);
(void) HostDecrUsecnt(h);
SCMutexUnlock(&h->m);
}
@ -464,7 +464,7 @@ Host *HostGetHostFromHash (Address *a)
/* found our host, lock & return */
SCMutexLock(&h->m);
HostIncrUsecnt(h);
(void) HostIncrUsecnt(h);
HRLOCK_UNLOCK(hb);
return h;
}
@ -473,7 +473,7 @@ Host *HostGetHostFromHash (Address *a)
/* lock & return */
SCMutexLock(&h->m);
HostIncrUsecnt(h);
(void) HostIncrUsecnt(h);
HRLOCK_UNLOCK(hb);
return h;
}
@ -533,7 +533,7 @@ Host *HostLookupHostFromHash (Address *a)
/* found our host, lock & return */
SCMutexLock(&h->m);
HostIncrUsecnt(h);
(void) HostIncrUsecnt(h);
HRLOCK_UNLOCK(hb);
return h;
}
@ -542,7 +542,7 @@ Host *HostLookupHostFromHash (Address *a)
/* lock & return */
SCMutexLock(&h->m);
HostIncrUsecnt(h);
(void) HostIncrUsecnt(h);
HRLOCK_UNLOCK(hb);
return h;
}
@ -610,7 +610,7 @@ static Host *HostGetUsedHost(void) {
SCMutexUnlock(&h->m);
SC_ATOMIC_ADD(host_prune_idx, (host_config.hash_size - cnt));
(void) SC_ATOMIC_ADD(host_prune_idx, (host_config.hash_size - cnt));
return h;
}

2
src/log-filestore.c
Unescape Escape View File

@ -487,7 +487,7 @@ static void LogFilestoreLogLoadWaldo(const char *path) {
if (fgets(line, (int)sizeof(line), fp) != NULL) {
if (sscanf(line, "%10u", &id) == 1) {
SCLogInfo("id %u", id);
SC_ATOMIC_CAS(&file_id, 0, id);
(void) SC_ATOMIC_CAS(&file_id, 0, id);
}
}
fclose(fp);

4
src/runmode-af-packet.c
Unescape Escape View File

@ -123,7 +123,7 @@ void *ParseAFPConfig(const char *iface)
strlcpy(aconf->iface, iface, sizeof(aconf->iface));
aconf->threads = 1;
SC_ATOMIC_INIT(aconf->ref);
SC_ATOMIC_ADD(aconf->ref, 1);
(void) SC_ATOMIC_ADD(aconf->ref, 1);
aconf->buffer_size = 0;
aconf->cluster_id = 1;
aconf->cluster_type = PACKET_FANOUT_HASH;
@ -168,7 +168,7 @@ void *ParseAFPConfig(const char *iface)
}
SC_ATOMIC_RESET(aconf->ref);
SC_ATOMIC_ADD(aconf->ref, aconf->threads);
(void) SC_ATOMIC_ADD(aconf->ref, aconf->threads);
if (ConfGetChildValue(if_root, "cluster-id", &tmpclusterid) != 1) {
SCLogError(SC_ERR_INVALID_ARGUMENT,"Could not get cluster-id from config");

2
src/runmode-pcap.c
Unescape Escape View File

@ -119,7 +119,7 @@ void *ParsePcapConfig(const char *iface)
}
SC_ATOMIC_INIT(aconf->ref);
SC_ATOMIC_ADD(aconf->ref, 1);
(void) SC_ATOMIC_ADD(aconf->ref, 1);
aconf->DerefFunc = PcapDerefConfig;
aconf->threads = 1;

8
src/runmode-pfring.c
Unescape Escape View File

@ -132,7 +132,7 @@ void *OldParsePfringConfig(const char *iface)
pfconf->DerefFunc = PfringDerefConfig;
pfconf->checksum_mode = CHECKSUM_VALIDATION_AUTO;
SC_ATOMIC_INIT(pfconf->ref);
SC_ATOMIC_ADD(pfconf->ref, 1);
(void) SC_ATOMIC_ADD(pfconf->ref, 1);
/* Find initial node */
if (ConfGet("pfring.threads", &threadsstr) != 1) {
@ -147,7 +147,7 @@ void *OldParsePfringConfig(const char *iface)
}
SC_ATOMIC_RESET(pfconf->ref);
SC_ATOMIC_ADD(pfconf->ref, pfconf->threads);
(void) SC_ATOMIC_ADD(pfconf->ref, pfconf->threads);
if (ConfGet("pfring.cluster-id", &tmpclusterid) != 1) {
SCLogError(SC_ERR_INVALID_ARGUMENT,"Could not get cluster-id from config");
@ -224,7 +224,7 @@ void *ParsePfringConfig(const char *iface)
#endif
pfconf->DerefFunc = PfringDerefConfig;
SC_ATOMIC_INIT(pfconf->ref);
SC_ATOMIC_ADD(pfconf->ref, 1);
(void) SC_ATOMIC_ADD(pfconf->ref, 1);
/* Find initial node */
pf_ring_node = ConfGetNode("pfring");
@ -256,7 +256,7 @@ void *ParsePfringConfig(const char *iface)
}
SC_ATOMIC_RESET(pfconf->ref);
SC_ATOMIC_ADD(pfconf->ref, pfconf->threads);
(void) SC_ATOMIC_ADD(pfconf->ref, pfconf->threads);
/* command line value has precedence */
if (ConfGet("pfring.cluster-id", &tmpclusterid) == 1) {

4
src/source-af-packet.c
Unescape Escape View File

@ -327,7 +327,7 @@ int AFPRead(AFPThreadVars *ptv)
ptv->pkts++;
ptv->bytes += caplen + offset;
SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
(void) SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
p->livedev = ptv->livedev;
/* add forged header */
@ -416,7 +416,7 @@ int AFPReadFromRing(AFPThreadVars *ptv)
ptv->pkts++;
ptv->bytes += h.h2->tp_len;
SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
(void) SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
p->livedev = ptv->livedev;
/* add forged header */

2
src/source-pcap.c
Unescape Escape View File

@ -217,7 +217,7 @@ void PcapCallbackLoop(char *user, struct pcap_pkthdr *h, u_char *pkt) {
ptv->pkts++;
ptv->bytes += h->caplen;
SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
(void) SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
p->livedev = ptv->livedev;
if (unlikely(PacketCopyData(p, pkt, h->caplen))) {

2
src/source-pfring.c
Unescape Escape View File

@ -186,7 +186,7 @@ static inline void PfringProcessPacket(void *user, struct pfring_pkthdr *h, Pack
ptv->bytes += h->caplen;
ptv->pkts++;
SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
(void) SC_ATOMIC_ADD(ptv->livedev->pkts, 1);
p->livedev = ptv->livedev;
/* PF_RING may fail to set timestamp */

4
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -116,7 +116,7 @@ void StreamTcpReassemblePseudoPacketCreate(TcpStream *, Packet *, PacketQueue *)
* \param size Size of the TCP segment and its payload length memory allocated
*/
void StreamTcpReassembleIncrMemuse(uint64_t size) {
SC_ATOMIC_ADD(ra_memuse, size);
(void) SC_ATOMIC_ADD(ra_memuse, size);
return;
}
@ -127,7 +127,7 @@ void StreamTcpReassembleIncrMemuse(uint64_t size) {
* \param size Size of the TCP segment and its payload length memory allocated
*/
void StreamTcpReassembleDecrMemuse(uint64_t size) {
SC_ATOMIC_SUB(ra_memuse, size);
(void) SC_ATOMIC_SUB(ra_memuse, size);
return;
}

6
src/stream-tcp.c
Unescape Escape View File

@ -128,12 +128,12 @@ void TmModuleStreamTcpRegister (void)
}
void StreamTcpIncrMemuse(uint64_t size) {
SC_ATOMIC_ADD(st_memuse, size);
(void) SC_ATOMIC_ADD(st_memuse, size);
return;
}
void StreamTcpDecrMemuse(uint64_t size) {
SC_ATOMIC_SUB(st_memuse, size);
(void) SC_ATOMIC_SUB(st_memuse, size);
return;
}
@ -3865,7 +3865,7 @@ static inline int StreamTcpValidateChecksum(Packet *p)
ret = 0;
SCLogDebug("Checksum of received packet %p is invalid",p);
if (p->livedev) {
SC_ATOMIC_ADD(p->livedev->invalid_checksums, 1);
(void) SC_ATOMIC_ADD(p->livedev->invalid_checksums, 1);
}
}

4
src/suricata.c
Unescape Escape View File

@ -1804,7 +1804,7 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
SC_ATOMIC_CAS(&engine_stage, SURICATA_INIT, SURICATA_RUNTIME);
(void) SC_ATOMIC_CAS(&engine_stage, SURICATA_INIT, SURICATA_RUNTIME);
/* Un-pause all the paused threads */
TmThreadContinueThreads();
@ -1875,7 +1875,7 @@ int main(int argc, char **argv)
}
/* Update the engine stage/status flag */
SC_ATOMIC_CAS(&engine_stage, SURICATA_RUNTIME, SURICATA_DEINIT);
(void) SC_ATOMIC_CAS(&engine_stage, SURICATA_RUNTIME, SURICATA_DEINIT);
#ifdef __SC_CUDA_SUPPORT__

24
src/tm-threads.c
Unescape Escape View File

@ -131,7 +131,9 @@ void *TmThreadsSlot1NoIn(void *td)
TmEcode r = TM_ECODE_OK;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);
@ -227,7 +229,9 @@ void *TmThreadsSlot1NoOut(void *td)
TmEcode r = TM_ECODE_OK;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);
@ -304,7 +308,9 @@ void *TmThreadsSlot1NoInOut(void *td)
TmEcode r = TM_ECODE_OK;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);
@ -378,7 +384,9 @@ void *TmThreadsSlot1(void *td)
TmEcode r = TM_ECODE_OK;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);
@ -581,7 +589,9 @@ void *TmThreadsSlotPktAcqLoop(void *td) {
TmSlot *slot = NULL;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);
@ -671,7 +681,9 @@ void *TmThreadsSlotVar(void *td)
TmEcode r = TM_ECODE_OK;
/* Set the thread name */
SCSetThreadName(tv->name);
if (SCSetThreadName(tv->name) < 0) {
SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
}
/* Drop the capabilities for this thread */
SCDropCaps(tv);

18
src/tmqh-flow.c
Unescape Escape View File

@ -236,8 +236,8 @@ void TmqhOutputFlowRoundRobin(ThreadVars *tv, Packet *p)
SC_ATOMIC_RESET(ctx->round_robin_idx);
qid = 0;
}
SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, qid);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
(void) SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, qid);
}
} else {
qid = ctx->last++;
@ -245,7 +245,7 @@ void TmqhOutputFlowRoundRobin(ThreadVars *tv, Packet *p)
if (ctx->last == ctx->size)
ctx->last = 0;
}
SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
PacketQueue *q = ctx->queues[qid].q;
SCMutexLock(&q->mutex_q);
@ -284,8 +284,8 @@ void TmqhOutputFlowActivePackets(ThreadVars *tv, Packet *p)
}
}
qid = lowest_id;
SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, lowest_id);
SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
(void) SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, lowest_id);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
}
} else {
qid = ctx->last++;
@ -293,7 +293,7 @@ void TmqhOutputFlowActivePackets(ThreadVars *tv, Packet *p)
if (ctx->last == ctx->size)
ctx->last = 0;
}
SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
PacketQueue *q = ctx->queues[qid].q;
SCMutexLock(&q->mutex_q);
@ -331,8 +331,8 @@ void TmqhOutputFlowHash(ThreadVars *tv, Packet *p)
/* we don't have to worry about possible overflow, since
* ctx->size will be lesser than 2 ** 31 for sure */
qid = addr % ctx->size;
SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, qid);
SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
(void) SC_ATOMIC_SET(p->flow->autofp_tmqh_flow_qid, qid);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_flows, 1);
}
} else {
qid = ctx->last++;
@ -340,7 +340,7 @@ void TmqhOutputFlowHash(ThreadVars *tv, Packet *p)
if (ctx->last == ctx->size)
ctx->last = 0;
}
SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
(void) SC_ATOMIC_ADD(ctx->queues[qid].total_packets, 1);
PacketQueue *q = ctx->queues[qid].q;
SCMutexLock(&q->mutex_q);

2
src/util-profiling.c
Unescape Escape View File

@ -1350,7 +1350,7 @@ ProfilingGenericTicksTest01(void) {
SC_ATOMIC_DECL_AND_INIT(unsigned int, test);
ticks_start = UtilCpuGetTicks();
for (i = 0; i < TEST_RUNS; i++) {
SC_ATOMIC_ADD(test,1);
(void) SC_ATOMIC_ADD(test,1);
}
ticks_end = UtilCpuGetTicks();
printf("SC_ATOMIC_ADD %"PRIu64"\n", (ticks_end - ticks_start)/TEST_RUNS);

20
src/util-ringbuffer.c
Unescape Escape View File

@ -193,7 +193,7 @@ void *RingBufferSrSw8Get(RingBuffer8 *rb) {
}
ptr = rb->array[SC_ATOMIC_GET(rb->read)];
SC_ATOMIC_ADD(rb->read, 1);
(void) SC_ATOMIC_ADD(rb->read, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -212,7 +212,7 @@ int RingBufferSrSw8Put(RingBuffer8 *rb, void *ptr) {
}
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -235,7 +235,7 @@ void *RingBufferSrMw8Get(RingBuffer8 *rb) {
}
ptr = rb->array[SC_ATOMIC_GET(rb->read)];
SC_ATOMIC_ADD(rb->read, 1);
(void) SC_ATOMIC_ADD(rb->read, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -286,7 +286,7 @@ retry:
/* update the ring buffer */
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
SCSpinUnlock(&rb->spin);
SCLogDebug("ptr %p, done", ptr);
@ -359,7 +359,7 @@ int RingBufferMrSw8Put(RingBuffer8 *rb, void *ptr) {
}
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -431,7 +431,7 @@ int RingBufferMrSwPut(RingBuffer16 *rb, void *ptr) {
}
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -455,7 +455,7 @@ void *RingBufferSrSwGet(RingBuffer16 *rb) {
}
ptr = rb->array[SC_ATOMIC_GET(rb->read)];
SC_ATOMIC_ADD(rb->read, 1);
(void) SC_ATOMIC_ADD(rb->read, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -474,7 +474,7 @@ int RingBufferSrSwPut(RingBuffer16 *rb, void *ptr) {
}
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondSignal(&rb->wait_cond);
@ -605,7 +605,7 @@ retry:
/* update the ring buffer */
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
SCSpinUnlock(&rb->spin);
SCLogDebug("ptr %p, done", ptr);
@ -785,7 +785,7 @@ retry:
/* update the ring buffer */
rb->array[SC_ATOMIC_GET(rb->write)] = ptr;
SC_ATOMIC_ADD(rb->write, 1);
(void) SC_ATOMIC_ADD(rb->write, 1);
SCSpinUnlock(&rb->spin);
SCLogDebug("ptr %p, done", ptr);

Write Preview
Loading…
Cancel
Save