counters: rename threadvars public counters

diff --git a/src/counters.c b/src/counters.c
index c214b123d2d933d110b1b66c436a7c53ec993206..d07666f784fab2b78469ab8e253a5013ca39a854 100644 (file)
--- a/src/counters.c
+++ b/src/counters.c
@@ -390,14 +390,14 @@ static void *SCPerfWakeupThread(void *arg)
 
         tv = tv_root[TVT_PPT];
         while (tv != NULL) {
-            if (tv->sc_perf_pctx.head == NULL) {
+            if (tv->perf_public_ctx.head == NULL) {
                 tv = tv->next;
                 continue;
             }
 
             /* assuming the assignment of an int to be atomic, and even if it's
              * not, it should be okay */
-            tv->sc_perf_pctx.perf_flag = 1;
+            tv->perf_public_ctx.perf_flag = 1;
 
             if (tv->inq != NULL) {
                 q = &trans_q[tv->inq->id];
@@ -410,14 +410,14 @@ static void *SCPerfWakeupThread(void *arg)
         /* mgt threads for flow manager */
         tv = tv_root[TVT_MGMT];
         while (tv != NULL) {
-            if (tv->sc_perf_pctx.head == NULL) {
+            if (tv->perf_public_ctx.head == NULL) {
                 tv = tv->next;
                 continue;
             }
 
             /* assuming the assignment of an int to be atomic, and even if it's
              * not, it should be okay */
-            tv->sc_perf_pctx.perf_flag = 1;
+            tv->perf_public_ctx.perf_flag = 1;
 
             tv = tv->next;
         }
@@ -898,7 +898,7 @@ uint16_t SCPerfTVRegisterCounter(char *cname, struct ThreadVars_ *tv, int type,
     uint16_t id = SCPerfRegisterQualifiedCounter(cname,
                                                  (tv->thread_group_name != NULL) ? tv->thread_group_name : tv->name,
                                                  type, desc,
-                                                 &tv->sc_perf_pctx,
+                                                 &tv->perf_public_ctx,
                                                  SC_PERF_TYPE_Q_NORMAL);
 
     return id;
@@ -923,7 +923,7 @@ uint16_t SCPerfTVRegisterAvgCounter(char *cname, struct ThreadVars_ *tv,
     uint16_t id = SCPerfRegisterQualifiedCounter(cname,
                                                  (tv->thread_group_name != NULL) ? tv->thread_group_name : tv->name,
                                                  type, desc,
-                                                 &tv->sc_perf_pctx,
+                                                 &tv->perf_public_ctx,
                                                  SC_PERF_TYPE_Q_AVERAGE);
 
     return id;
@@ -948,7 +948,7 @@ uint16_t SCPerfTVRegisterMaxCounter(char *cname, struct ThreadVars_ *tv,
     uint16_t id = SCPerfRegisterQualifiedCounter(cname,
                                                  (tv->thread_group_name != NULL) ? tv->thread_group_name : tv->name,
                                                  type, desc,
-                                                 &tv->sc_perf_pctx,
+                                                 &tv->perf_public_ctx,
                                                  SC_PERF_TYPE_Q_MAXIMUM);
 
     return id;
@@ -1386,7 +1386,7 @@ static int SCPerfTestGetCntArray05()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                               &tv.sc_perf_pctx);
+                               &tv.perf_public_ctx);
     if (id != 1) {
         printf("id %d: ", id);
         return 0;
@@ -1406,15 +1406,15 @@ static int SCPerfTestGetCntArray06()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                               &tv.sc_perf_pctx);
+                               &tv.perf_public_ctx);
     if (id != 1)
         return 0;
 
-    tv.sc_perf_pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    tv.sc_perf_pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     result = (tv.sc_perf_pca)?1:0;
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(tv.sc_perf_pca);
 
     return result;
@@ -1431,18 +1431,18 @@ static int SCPerfTestCntArraySize07()
     //pca = (SCPerfPrivateContext *)&tv.sc_perf_pca;
 
     SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                          &tv.sc_perf_pctx);
+                          &tv.perf_public_ctx);
     SCPerfRegisterCounter("t2", "c2", SC_PERF_TYPE_UINT64, NULL,
-                          &tv.sc_perf_pctx);
+                          &tv.perf_public_ctx);
 
-    pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     SCPerfCounterIncr(1, pca);
     SCPerfCounterIncr(2, pca);
 
     result = pca->size;
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(pca);
 
     return result;
@@ -1458,16 +1458,16 @@ static int SCPerfTestUpdateCounter08()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                               &tv.sc_perf_pctx);
+                               &tv.perf_public_ctx);
 
-    pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     SCPerfCounterIncr(id, pca);
     SCPerfCounterAddUI64(id, pca, 100);
 
     result = pca->head[id].ui64_cnt;
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(pca);
 
     return result;
@@ -1483,24 +1483,24 @@ static int SCPerfTestUpdateCounter09()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id1 = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     SCPerfRegisterCounter("t2", "c2", SC_PERF_TYPE_UINT64, NULL,
-                          &tv.sc_perf_pctx);
+                          &tv.perf_public_ctx);
     SCPerfRegisterCounter("t3", "c3", SC_PERF_TYPE_UINT64, NULL,
-                          &tv.sc_perf_pctx);
+                          &tv.perf_public_ctx);
     SCPerfRegisterCounter("t4", "c4", SC_PERF_TYPE_UINT64, NULL,
-                          &tv.sc_perf_pctx);
+                          &tv.perf_public_ctx);
     id2 = SCPerfRegisterCounter("t5", "c5", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
 
-    pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     SCPerfCounterIncr(id2, pca);
     SCPerfCounterAddUI64(id2, pca, 100);
 
     result = (pca->head[id1].ui64_cnt == 0) && (pca->head[id2].ui64_cnt == 101);
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(pca);
 
     return result;
@@ -1517,26 +1517,26 @@ static int SCPerfTestUpdateGlobalCounter10()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id1 = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     id2 = SCPerfRegisterCounter("t2", "c2", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     id3 = SCPerfRegisterCounter("t3", "c3", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
 
-    pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     SCPerfCounterIncr(id1, pca);
     SCPerfCounterAddUI64(id2, pca, 100);
     SCPerfCounterIncr(id3, pca);
     SCPerfCounterAddUI64(id3, pca, 100);
 
-    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx);
+    SCPerfUpdateCounterArray(pca, &tv.perf_public_ctx);
 
-    result = (1 == tv.sc_perf_pctx.head->value);
-    result &= (100 == tv.sc_perf_pctx.head->next->value);
-    result &= (101 == tv.sc_perf_pctx.head->next->next->value);
+    result = (1 == tv.perf_public_ctx.head->value);
+    result &= (100 == tv.perf_public_ctx.head->next->value);
+    result &= (101 == tv.perf_public_ctx.head->next->next->value);
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(pca);
 
     return result;
@@ -1553,32 +1553,32 @@ static int SCPerfTestCounterValues11()
     memset(&tv, 0, sizeof(ThreadVars));
 
     id1 = SCPerfRegisterCounter("t1", "c1", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     id2 = SCPerfRegisterCounter("t2", "c2", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     id3 = SCPerfRegisterCounter("t3", "c3", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
     id4 = SCPerfRegisterCounter("t4", "c4", SC_PERF_TYPE_UINT64, NULL,
-                                &tv.sc_perf_pctx);
+                                &tv.perf_public_ctx);
 
-    pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
 
     SCPerfCounterIncr(id1, pca);
     SCPerfCounterAddUI64(id2, pca, 256);
     SCPerfCounterAddUI64(id3, pca, 257);
     SCPerfCounterAddUI64(id4, pca, 16843024);
 
-    SCPerfUpdateCounterArray(pca, &tv.sc_perf_pctx);
+    SCPerfUpdateCounterArray(pca, &tv.perf_public_ctx);
 
-    result &= (1 == tv.sc_perf_pctx.head->value);
+    result &= (1 == tv.perf_public_ctx.head->value);
 
-    result &= (256 == tv.sc_perf_pctx.head->next->value);
+    result &= (256 == tv.perf_public_ctx.head->next->value);
 
-    result &= (257 == tv.sc_perf_pctx.head->next->next->value);
+    result &= (257 == tv.perf_public_ctx.head->next->next->value);
 
-    result &= (16843024 == tv.sc_perf_pctx.head->next->next->next->value);
+    result &= (16843024 == tv.perf_public_ctx.head->next->next->next->value);
 
-    SCPerfReleasePerfCounterS(tv.sc_perf_pctx.head);
+    SCPerfReleasePerfCounterS(tv.perf_public_ctx.head);
     SCPerfReleasePCA(pca);
 
     return result;

diff --git a/src/counters.h b/src/counters.h
index c3bdca24422c2996770d5d4edd6c5ff6488f2f2a..c10eb4e50c1f044315861a3514560aa582222af8 100644 (file)
--- a/src/counters.h
+++ b/src/counters.h
@@ -180,12 +180,12 @@ void SCPerfRegisterTests(void);
 void SCPerfCounterAddUI64(uint16_t, SCPerfPrivateContext *, uint64_t);
 
 #define SCPerfSyncCounters(tv) \
-    SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx);           \
+    SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->perf_public_ctx);           \
 
 #define SCPerfSyncCountersIfSignalled(tv)                                       \
     do {                                                                        \
-        if ((tv)->sc_perf_pctx.perf_flag == 1) {                                \
-            SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->sc_perf_pctx);   \
+        if ((tv)->perf_public_ctx.perf_flag == 1) {                                \
+            SCPerfUpdateCounterArray((tv)->sc_perf_pca, &(tv)->perf_public_ctx);   \
         }                                                                       \
     } while (0)
 

diff --git a/src/detect.c b/src/detect.c
index 4069a5d5b9a16ee56c784c83848693b074844020..6ca2b30bdd71894ff4ce4ce552f29da67b5ebd11 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -11263,9 +11263,9 @@ static int SigTestDetectAlertCounter(void)
     DetectEngineThreadCtxInit(&tv, de_ctx, (void *)&det_ctx);
 
     /* init counters */
-    tv.sc_perf_pca = SCPerfGetAllCountersArray(&tv.sc_perf_pctx);
+    tv.sc_perf_pca = SCPerfGetAllCountersArray(&tv.perf_public_ctx);
     SCPerfAddToClubbedTMTable((tv.thread_group_name != NULL) ?
-            tv.thread_group_name : tv.name, &tv.sc_perf_pctx);
+            tv.thread_group_name : tv.name, &tv.perf_public_ctx);
 
     p = UTHBuildPacket((uint8_t *)"boo", strlen("boo"), IPPROTO_TCP);
     Detect(&tv, p, det_ctx, NULL, NULL);

diff --git a/src/threadvars.h b/src/threadvars.h
index 25045f1979196457dd524c9aefd54e57c51947fd..d6d8265dc877e552eeb34123ce50fcaa48b476a3 100644 (file)
--- a/src/threadvars.h
+++ b/src/threadvars.h
@@ -104,7 +104,7 @@ typedef struct ThreadVars_ {
     /* counters */
 
     /** public counter store: counter syncs update this */
-    SCPerfPublicContext sc_perf_pctx;
+    SCPerfPublicContext perf_public_ctx;
 
     /** private counter store: counter updates modify this */
     SCPerfPrivateContext *sc_perf_pca;

diff --git a/src/tm-threads.c b/src/tm-threads.c
index 6ad8b6fedf098efcdb99ebfc3f597fc154d0f74c..dfe0bcc59b5fb935459a97a55b48614e36378fd9 100644 (file)
--- a/src/tm-threads.c
+++ b/src/tm-threads.c
@@ -322,9 +322,9 @@ void *TmThreadsSlotPktAcqLoop(void *td)
         }
     }
 
-    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->sc_perf_pctx);
+    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->perf_public_ctx);
     SCPerfAddToClubbedTMTable((tv->thread_group_name != NULL) ?
-            tv->thread_group_name : tv->name, &tv->sc_perf_pctx);
+            tv->thread_group_name : tv->name, &tv->perf_public_ctx);
 
     TmThreadsSetFlag(tv, THV_INIT_DONE);
 
@@ -455,9 +455,9 @@ void *TmThreadsSlotVar(void *td)
         }
     }
 
-    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->sc_perf_pctx);
+    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->perf_public_ctx);
     SCPerfAddToClubbedTMTable((tv->thread_group_name != NULL) ?
-            tv->thread_group_name : tv->name, &tv->sc_perf_pctx);
+            tv->thread_group_name : tv->name, &tv->perf_public_ctx);
 
     TmThreadsSetFlag(tv, THV_INIT_DONE);
 
@@ -597,9 +597,9 @@ static void *TmThreadsManagement(void *td)
     memset(&s->slot_pre_pq, 0, sizeof(PacketQueue));
     memset(&s->slot_post_pq, 0, sizeof(PacketQueue));
 
-    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->sc_perf_pctx);
+    tv->sc_perf_pca = SCPerfGetAllCountersArray(&tv->perf_public_ctx);
     SCPerfAddToClubbedTMTable((tv->thread_group_name != NULL) ?
-            tv->thread_group_name : tv->name, &tv->sc_perf_pctx);
+            tv->thread_group_name : tv->name, &tv->perf_public_ctx);
 
     TmThreadsSetFlag(tv, THV_INIT_DONE);
 
@@ -1045,7 +1045,7 @@ ThreadVars *TmThreadCreate(char *name, char *inq_name, char *inqh_name,
     memset(tv, 0, sizeof(ThreadVars));
 
     SC_ATOMIC_INIT(tv->flags);
-    SCMutexInit(&tv->sc_perf_pctx.m, NULL);
+    SCMutexInit(&tv->perf_public_ctx.m, NULL);
 
     tv->name = name;
     /* default state for every newly created thread */
@@ -1653,7 +1653,7 @@ void TmThreadFree(ThreadVars *tv)
 
     SCLogDebug("Freeing thread '%s'.", tv->name);
 
-    SCMutexDestroy(&tv->sc_perf_pctx.m);
+    SCMutexDestroy(&tv->perf_public_ctx.m);
 
     s = (TmSlot *)tv->tm_slots;
     while (s) {

diff --git a/src/unix-manager.c b/src/unix-manager.c
index b8eb0045ca44d10ef92de05cae8afe9ed9447f0c..dd2d2d91d29495b9606eb998cb7f616d0492eedc 100644 (file)
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -868,8 +868,8 @@ static TmEcode UnixManager(ThreadVars *th_v, void *thread_data)
     /* set the thread name */
     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);
+    th_v->sc_perf_pca = SCPerfGetAllCountersArray(&th_v->perf_public_ctx);
+    SCPerfAddToClubbedTMTable(th_v->name, &th_v->perf_public_ctx);
 
     if (UnixNew(&command) == 0) {
         int failure_fatal = 0;