Changeset 29bbef0 for tools

Timestamp:

03/30/14 17:48:26 (8 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:

f1015ad

Parents:

dad224b

Message:

My work from over summer, with a few things tidied up and updated to include recent commits/patches to bring this up to date. Still very much work in progress.

Location:

tools

Files:

• traceanon/Makefile.am (modified) (3 diffs)
• traceanon/panon.c (modified) (2 diffs)
• traceanon/traceanon_parallel.c (added)
• tracertstats/Makefile.am (modified) (2 diffs)
• tracertstats/tracertstats_parallel.c (added)
• tracestats/Makefile.am (modified) (2 diffs)
• tracestats/tracestats_parallel.c (added)

tools/traceanon/Makefile.am

@@ -1 @@
-bin_PROGRAMS = traceanon
+bin_PROGRAMS = traceanon traceanon_parallel
 
 man_MANS = traceanon.1
@@ -6 +6 @@
 include ../Makefile.tools
 traceanon_SOURCES = traceanon.c rijndael.h rijndael.c panon.h panon.c ipenc.c ipenc.h 
+traceanon_parallel_SOURCES = traceanon_parallel.c rijndael.h rijndael.c panon.h panon.c ipenc.c ipenc.h 
 
 # rijndael.c does lots of nasty casting that is going to be a nightmare to fix
@@ -11 +12 @@
 # messy and hopefully isn't actually an issue. 
 traceanon_CFLAGS = $(AM_CFLAGS)
+traceanon_parallel_CFLAGS = $(AM_CFLAGS)

tools/traceanon/panon.c

@@ -8 +8 @@
 #include "panon.h"
 
-static uint8_t m_key[16];
-static uint8_t m_pad[16];
+static __thread uint8_t m_key[16];
+static __thread  uint8_t m_pad[16];
 
 #define CACHEBITS 20
@@ -16 +16 @@
 //static uint32_t enc_cache[CACHESIZE];
 
-static uint32_t *enc_cache = 0;
-static uint32_t fullcache[2][2];
+static __thread  uint32_t *enc_cache = 0; // Should be ok shared across multiple
+static __thread  uint32_t fullcache[2][2]; // Needs to be against on thread
 
 

tools/tracertstats/Makefile.am

@@ -1 @@
-bin_PROGRAMS = tracertstats
+bin_PROGRAMS = tracertstats tracertstats_parallel
 man_MANS = tracertstats.1
 EXTRA_DIST = $(man_MANS)
@@ -16 +16 @@
 tracertstats_SOURCES = tracertstats.c output.h output.c $(OUTPUT_MODULES)
 tracertstats_LDADD = -ltrace $(OUTPUT_PNG_LD)
+tracertstats_parallel_SOURCES = tracertstats_parallel.c output.h output.c $(OUTPUT_MODULES)
+tracertstats_parallel_LDADD = -ltrace $(OUTPUT_PNG_LD)

tools/tracestats/Makefile.am

@@ -1 @@
-bin_PROGRAMS = tracestats
+bin_PROGRAMS = tracestats tracestats_parallel
 bin_SCRIPTS = tracesummary
 
@@ -7 +7 @@
 include ../Makefile.tools
 tracestats_SOURCES = tracestats.c
+tracestats_parallel_SOURCES = tracestats_parallel.c