Changeset 6c09048


Ignore:
Timestamp:
02/27/15 11:11:30 (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:
7718e54
Parents:
b81f0a1
Message:

Fix checking for clock_gettime for the DPDK format

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r4631115 r6c09048  
    417417if test "$have_numa" = 1; then
    418418        LIBTRACE_LIBS="$LIBTRACE_LIBS -lnuma"
    419         AC_DEFINE(HAVE_LIBNUMA, 1, [Set to 1 if libnuma is found supported])
     419        AC_DEFINE(HAVE_LIBNUMA, 1, [Set to 1 if libnuma is supported])
    420420        with_numa=yes
    421421else
    422         AC_DEFINE(HAVE_LIBNUMA, 0, [Set to 1 if libnuma is found supported])
     422        AC_DEFINE(HAVE_LIBNUMA, 0, [Set to 1 if libnuma is supported])
    423423        with_numa=no
    424424fi
     
    457457
    458458if test "$have_clock_gettime" = 1; then
    459     LIBTRACE_LIBS="$LIBTRACE_LIBS -lrt"
     459        LIBTRACE_LIBS="$LIBTRACE_LIBS -lrt"
     460        AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Set to 1 if clock_gettime is supported])
     461        with_clock_gettime=yes
     462else
     463        AC_DEFINE(HAVE_CLOCK_GETTIME, 0, [Set to 1 if clock_gettime is supported])
     464        with_clock_gettime=no
    460465fi
    461466
     
    699704
    700705if test x"$libtrace_dpdk" = xtrue; then
    701     AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
    702     reportopt "Compiled with DPDK trace NUMA support" $with_numa
     706        AC_MSG_NOTICE([Compiled with DPDK live capture support: Yes])
     707        reportopt "Compiled with DPDK trace NUMA support" $with_numa
     708        reportopt "Compiled with clock_gettime support" $with_clock_gettime
    703709elif test x"$want_dpdk" != "xno"; then
    704710#   We don't officially support DPDK so only report failure if the user
    705711#   explicitly asked for DPDK. That way, we can hopefully keep it hidden
    706712#   from most users for now...
    707        
    708     AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
    709     AC_MSG_NOTICE([Note: Requires DPDK v1.5 or newer])
     713
     714        AC_MSG_NOTICE([Compiled with DPDK live capture support: No])
     715        AC_MSG_NOTICE([Note: Requires DPDK v1.5 or newer])
    710716fi
    711717reportopt "Compiled with LLVM BPF JIT support" $JIT
  • lib/format_dpdk.c

    rb81f0a1 r6c09048  
    237237 * kernel.
    238238 */
    239 #ifdef HAVE_LIBRT
     239#ifdef HAVE_CLOCK_GETTIME
    240240/* You can turn this on (set to 1) to prefer clock_gettime */
    241241#define USE_CLOCK_GETTIME 1
    242242#else
    243 /* DONT CHANGE THIS !!! */
    244 #define USE_CLOCK_GETTIME 1
     243/* DON'T CHANGE THIS !!! */
     244#define USE_CLOCK_GETTIME 0
    245245#endif
    246246
Note: See TracChangeset for help on using the changeset viewer.