Changeset c04929c for lib


Ignore:
Timestamp:
08/02/13 17:30:15 (8 years ago)
Author:
Richard Sanger <rjs51@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, 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:
3799f51
Parents:
212faa13
Message:

Added the new live trace format Intel DPDK - See the wiki for more documentation

Location:
lib
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    rc909fad rc04929c  
    2626endif
    2727
     28if HAVE_DPDK
     29NATIVEFORMATS+= format_dpdk.c
     30# So we also make libtrace.mk in dpdk otherwise automake tries to expand
     31# it to early which I cannot seem to stop unless we use a path that
     32# doesn't exist currently
     33export RTE_SDK=@RTE_SDK@
     34export RTE_TARGET=@RTE_TARGET@
     35include $(RTE_SDK)/mk/rte.vars.mk
     36# We need to add -Wl before the linker otherwise this breaks our build
     37# This is added in with our make script patch to the DPDK library
     38include $(RTE_SDK)/mk/libtrace.mk
     39endif
    2840
    2941libtrace_la_SOURCES = trace.c common.h \
  • lib/libtrace.h.in

    r11041eb rc04929c  
    323323        TRACE_FORMAT_LINUX_RING   =15,  /**< Linux native interface capture PACKET_MMAP */
    324324        TRACE_FORMAT_RAWERF       =16,  /**< Special format for reading uncompressed ERF traces without checking for compression */
     325    TRACE_FORMAT_DPDK     =17, /**< The Intel Data Plane Development Kit format */
    325326};
    326327
     
    373374        /** RT is encapsulating a Linux native PACKET_MMAP capture record */
    374375        TRACE_RT_DATA_LINUX_RING=TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_LINUX_RING,
     376    /** RT is encapsulating a Intel DPDK capture record */
     377        TRACE_RT_DATA_DPDK=TRACE_RT_DATA_SIMPLE+TRACE_FORMAT_DPDK,
    375378
    376379        /** As PCAP does not store the linktype with the packet, we need to
  • lib/libtrace_int.h

    rda46c9d rc04929c  
    929929 * @{
    930930 */
    931 #if __BYTE_ORDER == __BIG_ENDIAN
     931#if BYTE_ORDER == BIG_ENDIAN
    932932#define bswap_host_to_be64(num) ((uint64_t)(num))
    933933#define bswap_host_to_le64(num) byteswap64(num)
     
    947947 * attempt to optimise it
    948948 */
    949 #elif __BYTE_ORDER == __LITTLE_ENDIAN
     949#elif BYTE_ORDER == LITTLE_ENDIAN
    950950#define bswap_host_to_be64(num) (byteswap64(num))
    951951#define bswap_host_to_le64(num) ((uint64_t)(num))
     
    10211021void bpf_constructor(void);
    10221022#endif
     1023#if HAVE_DPDK
     1024/** Constructor for Intels DPDK format module */
     1025void dpdk_constructor(void);
     1026#endif
    10231027
    10241028/** Extracts the RadioTap flags from a wireless link header
  • lib/trace.c

    r212faa13 rc04929c  
    146146#ifdef HAVE_DAG
    147147                dag_constructor();
     148#endif
     149#ifdef HAVE_DPDK
     150        dpdk_constructor();
    148151#endif
    149152        }
Note: See TracChangeset for help on using the changeset viewer.