Changeset fed9152 for tools

Timestamp:

01/20/15 10:52:15 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

1b59edf, cb39d35

Parents:

18bf317 (diff), 04bf7c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'tidy_parallel_libtrace' into develop

Location:

tools/traceanon

Files:

• ipenc.c (modified) (2 diffs)
• rijndael.c (modified) (1 diff)

tools/traceanon/ipenc.c

@@ -19 +19 @@
 #endif
 
-static enum enc_type_t enc_type = ENC_NONE;
+static __thread enum enc_type_t enc_type = ENC_NONE;
 
 static uint32_t masks[33] = {
@@ -31 +31 @@
 };
 
-static uint32_t prefix;
-static uint32_t netmask;
+static __thread uint32_t prefix;
+static __thread uint32_t netmask;
 static void init_prefix(const char *key)
 {

tools/traceanon/rijndael.c

@@ -50 +50 @@
 #include <string.h>
 
-static State     m_state;
-static Mode      m_mode;
-static Direction m_direction;
-static UINT8     m_initVector[MAX_IV_SIZE];
-static UINT32    m_uRounds;
-static UINT8     m_expandedKey[_MAX_ROUNDS+1][4][4];
-
+static __thread State     m_state;
+static __thread Mode      m_mode;
+static __thread Direction m_direction;
+static __thread UINT8     m_initVector[MAX_IV_SIZE];
+static __thread UINT32    m_uRounds;
+static __thread UINT8     m_expandedKey[_MAX_ROUNDS+1][4][4];
 
 static UINT8 S[256]=