Changeset 60f3c4c


Ignore:
Timestamp:
03/06/12 15:36:43 (9 years ago)
Author:
Shane Alcock <salcock@…>
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:
1d4db58
Parents:
bd6576d
Message:
  • Shifted wandio into a separate library, seeing as we're going to be exporting the API now
Files:
1 added
4 edited
12 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rf2b53d2 r60f3c4c  
    11LIBPACKETDUMP_DIR = libpacketdump
    22TOOLS_DIR = tools
    3 SUBDIRS = lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
     3WANDIO_DIR=libwandio
     4SUBDIRS = $(WANDIO_DIR) lib $(LIBPACKETDUMP_DIR) $(TOOLS_DIR) docs examples
    45
    56ACLOCAL_AMFLAGS = -I m4
  • configure.in

    r17094b2 r60f3c4c  
    4141        examples/stats/Makefile examples/tutorial/Makefile
    4242        docs/libtrace.doxygen
    43         lib/libtrace.h
     43        lib/libtrace.h libwandio/Makefile
    4444        ])
    4545
     
    100100
    101101LIBPKTDUMP_LIBS="-ltrace "
    102 ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib"
    103 LIBTRACE_LIBS=""
     102ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/libwandio -L\$(abs_top_srcdir)/lib"
     103LIBTRACE_LIBS="-lwandio"
    104104TOOLS_LIBS=""
     105LIBWANDIO_LIBS=""
    105106
    106107# Set our C compiler flags based on the gcc version
     
    395396
    396397if test "$have_pthread" = 1; then
    397         LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
     398        LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lpthread"
    398399        AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
    399400fi
     
    494495AS_IF([test "x$have_bzip" = "xyes"], [
    495496        if test "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
    496                 LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
     497                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lbz2"
    497498        fi
    498499        with_bzip2=yes
     
    515516AS_IF([test "x$have_zlib" = "xyes"], [
    516517        if test "$ac_cv_lib_z_deflate" != "none required"; then
    517                 LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
     518                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lz"
    518519        fi
    519520        AC_DEFINE(HAVE_LIBZ, 1, "Compiled with zlib support")
     
    537538AS_IF([test "x$have_lzo" = "xyes"], [
    538539        if test "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
    539                 LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
     540                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -llzo2"
    540541        fi
    541542        AC_DEFINE(HAVE_LIBLZO2, 1, "Compiled with lzo2 support")
     
    571572AC_SUBST([LIBTRACE_LIBS])
    572573AC_SUBST([LIBPKTDUMP_LIBS])
     574AC_SUBST([LIBWANDIO_LIBS])
    573575AC_SUBST([TOOLS_LIBS])
    574576#AC_SUBST([ADD_LIBS])
  • lib/Makefile.am

    r8753bb8 r60f3c4c  
    11lib_LTLIBRARIES = libtrace.la
    2 include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h wandio.h
     2include_HEADERS = libtrace.h dagformat.h lt_inttypes.h daglegacy.h rt_protocol.h erftypes.h
    33
    44AM_CFLAGS=@LIBCFLAGS@
     
    1616else
    1717BPFFORMATS=
    18 endif
    19 
    20 if HAVE_ZLIB
    21 LIBTRACEIO_ZLIB=ior-zlib.c iow-zlib.c
    22 else
    23 LIBTRACEIO_ZLIB=
    24 endif
    25 
    26 if HAVE_BZLIB
    27 LIBTRACEIO_BZLIB=ior-bzip.c iow-bzip.c
    28 else
    29 LIBTRACEIO_BZLIB=
    30 endif
    31 
    32 if HAVE_LZO
    33 LIBTRACEIO_LZO=iow-lzo.c
    34 else
    35 LIBTRACEIO_LZO=
    3618endif
    3719
     
    6547                $(DAGSOURCE) format_erf.h \
    6648                $(BPFJITSOURCE) \
    67                 $(LIBTRACEIO_ZLIB) $(LIBTRACEIO_BZLIB) $(LIBTRACEIO_LZO) \
    68                 ior-peek.c ior-stdio.c ior-thread.c \
    69                 iow-stdio.c iow-thread.c wandio.c \
    70                 wandio.h arphrd.h
     49                arphrd.h
    7150
    7251if DAG2_4
     
    7453endif
    7554
    76 INCLUDES = @ADD_INCLS@
     55INCLUDES= @ADD_INCLS@ -I../libwandio
    7756libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@
    7857libtrace_la_LDFLAGS=-version-info @LIBTRACE_MAJOR@:@LIBTRACE_MINOR@:@LIBTRACE_MID@ @ADD_LDFLAGS@
  • test/do-check-tracesets.sh

    r99425f8 r60f3c4c  
    11#!/bin/bash
    22
    3 PREFIX=${1:-/trace/mojo-public}
     3PREFIX=${1:-/trace}
    44TEST=./test-convert2
    55export LD_LIBRARY_PATH=../lib/.libs:../libpacketdump/.libs
     
    1212for i in ${PREFIX}/auckland/2/*.gz; do
    1313        echo -n " * $i: "
    14         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    15         break
     14        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     15        #break
    1616done
    1717
     
    2020for i in ${PREFIX}/auckland/4/*.gz; do
    2121        echo -n " * $i: "
    22         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    23         break
     22        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     23        #break
    2424done
    2525
     
    2828for i in ${PREFIX}/auckland/6/*-[01].gz; do
    2929        echo -n " * $i: "
    30         ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    31         break
     30        ${TEST} legacyatm:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     31        #break
    3232done
    3333for i in ${PREFIX}/auckland/6/*-e[01].gz; do
    3434        echo -n " * $i: "
    35         ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    36         break
     35        ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     36        #break
    3737done
    3838
     
    4141for i in ${PREFIX}/auckland/8/*.gz; do
    4242        echo -n " * $i: "
    43         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    44         break
     43        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     44        #break
    4545done
    4646
     
    4949for i in ${PREFIX}/auckland/9/*.gz; do
    5050        echo -n " * $i: "
    51         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    52         break
     51        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     52        #break
    5353done
    5454
     
    5757for i in ${PREFIX}/pma/long/ipls/1/*.gz; do
    5858        echo -n " * $i: "
    59         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    60         break
     59        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     60        #break
    6161done
    6262
     
    6565for i in ${PREFIX}/pma/long/ipls/2/*.gz; do
    6666        echo -n " * $i: "
    67         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    68         break
     67        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     68        #break
    6969done
    7070
     
    7373for i in ${PREFIX}/pma/long/ipls/3/*.gz; do
    7474        echo -n " * $i: "
    75         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    76         break
     75        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     76        #break
    7777done
    7878
     
    8181for i in ${PREFIX}/pma/long/leip/1/*.gz; do
    8282        echo -n " * $i: "
    83         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    84         break
     83        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     84        #break
    8585done
    8686
     
    8989for i in ${PREFIX}/pma/long/leip/2/*-[01].gz; do
    9090        echo -n " * $i: "
    91         ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    92         break
     91        ${TEST} legacypos:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     92        #break
    9393done
    9494for i in ${PREFIX}/pma/long/leip/2/*-e.gz; do
    9595        echo -n " * $i: "
    96         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    97         break
     96        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     97        #break
    9898done
    9999
     
    102102for i in ${PREFIX}/pma/long/nzix/2/*.gz; do
    103103        echo -n " * $i: "
    104         ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    105         break
     104        ${TEST} legacyeth:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     105        #break
    106106done
    107107
     
    110110for i in ${PREFIX}/pma/long/sdag/1/*.gz; do
    111111        echo -n " * $i: "
    112         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    113         break
     112        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     113        #break
    114114done
    115115
     
    119119for i in ${PREFIX}/waikato/1/*[0-9].gz; do
    120120        echo -n " * $i: "
    121         ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test.pcap && echo PASS
    122         break
     121        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     122        #break
     123done
     124
     125echo Testing Waikato II
     126for i in ${PREFIX}/waikato/2/*[0-9].gz; do
     127        echo -n " * $i: "
     128        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     129        #break
     130done
     131
     132echo Testing Waikato III
     133for i in ${PREFIX}/waikato/3/*[0-9].gz; do
     134        echo -n " * $i: "
     135        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     136        #break
     137done
     138
     139echo Testing Waikato IV
     140for i in ${PREFIX}/waikato/4/*[0-9].gz; do
     141        echo -n " * $i: "
     142        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     143        #break
     144done
     145
     146echo Testing Waikato V
     147for i in ${PREFIX}/waikato/5/*[0-9].gz; do
     148        echo -n " * $i: "
     149        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     150        #break
     151done
     152
     153echo Testing Waikato VI
     154for i in ${PREFIX}/waikato/6/*[0-9].gz; do
     155        echo -n " * $i: "
     156        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     157        #break
     158done
     159
     160echo Testing Waikato VIII
     161for i in ${PREFIX}/waikato/8/*[0-9].gz; do
     162        echo -n " * $i: "
     163        ${TEST} erf:$i pcapfile:/scratch/salcock/libtrace_test/convert_test2.pcap && echo PASS
     164        #break
    123165done
    124166
    125167
     168
     169
    126170echo Testing complete
Note: See TracChangeset for help on using the changeset viewer.