Changeset d420777 for tools/traceanon


Ignore:
Timestamp:
08/19/15 13:37:05 (6 years ago)
Author:
Shane Alcock <salcock@…>
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:
461582b
Parents:
c24de65 (diff), 6210f82 (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 remote branch 'parallel/develop' into libtrace4

Location:
tools/traceanon
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • tools/traceanon/Makefile.am

    rc0a5a50 r29bbef0  
    1 bin_PROGRAMS = traceanon
     1bin_PROGRAMS = traceanon traceanon_parallel
    22
    33man_MANS = traceanon.1
     
    66include ../Makefile.tools
    77traceanon_SOURCES = traceanon.c rijndael.h rijndael.c panon.h panon.c ipenc.c ipenc.h
     8traceanon_parallel_SOURCES = traceanon_parallel.c rijndael.h rijndael.c panon.h panon.c ipenc.c ipenc.h
    89
    910# rijndael.c does lots of nasty casting that is going to be a nightmare to fix
     
    1112# messy and hopefully isn't actually an issue.
    1213traceanon_CFLAGS = $(AM_CFLAGS)
     14traceanon_parallel_CFLAGS = $(AM_CFLAGS)
  • tools/traceanon/ipenc.c

    ra8f2692 r925ae60  
    1919#endif
    2020
    21 static enum enc_type_t enc_type = ENC_NONE;
     21static __thread enum enc_type_t enc_type = ENC_NONE;
    2222
    2323static uint32_t masks[33] = {
     
    3131};
    3232
    33 static uint32_t prefix;
    34 static uint32_t netmask;
     33static __thread uint32_t prefix;
     34static __thread uint32_t netmask;
    3535static void init_prefix(const char *key)
    3636{
  • tools/traceanon/panon.c

    ra3041a4 r29bbef0  
    88#include "panon.h"
    99
    10 static uint8_t m_key[16];
    11 static uint8_t m_pad[16];
     10static __thread uint8_t m_key[16];
     11static __thread  uint8_t m_pad[16];
    1212
    1313#define CACHEBITS 20
     
    1616//static uint32_t enc_cache[CACHESIZE];
    1717
    18 static uint32_t *enc_cache = 0;
    19 static uint32_t fullcache[2][2];
     18static __thread  uint32_t *enc_cache = 0; // Should be ok shared across multiple
     19static __thread  uint32_t fullcache[2][2]; // Needs to be against on thread
    2020
    2121
  • tools/traceanon/rijndael.c

    rc0a5a50 r925ae60  
    5050#include <string.h>
    5151
    52 static State     m_state;
    53 static Mode      m_mode;
    54 static Direction m_direction;
    55 static UINT8     m_initVector[MAX_IV_SIZE];
    56 static UINT32    m_uRounds;
    57 static UINT8     m_expandedKey[_MAX_ROUNDS+1][4][4];
    58 
     52static __thread State     m_state;
     53static __thread Mode      m_mode;
     54static __thread Direction m_direction;
     55static __thread UINT8     m_initVector[MAX_IV_SIZE];
     56static __thread UINT32    m_uRounds;
     57static __thread UINT8     m_expandedKey[_MAX_ROUNDS+1][4][4];
    5958
    6059static UINT8 S[256]=
Note: See TracChangeset for help on using the changeset viewer.