Skip to content

Commit 4707de3

Browse files
committed
support dpdk-17.05.2 ans
1 parent 0e0c2f5 commit 4707de3

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Diff for: auto/make

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fi
2626

2727
CORE_LIBS="$CORE_LIBS -L$RTE_SDK/$RTE_TARGET/lib/"
2828
CORE_LIBS="$CORE_LIBS $ANS_PATH/librte_anssock/librte_anssock.a"
29-
CORE_LIBS="$CORE_LIBS -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic"
29+
CORE_LIBS="$CORE_LIBS -Wl,--whole-archive -Wl,-lrte_mbuf -Wl,-lrte_mempool_ring -Wl,-lrte_mempool -Wl,-lrte_ring -Wl,-lrte_eal -Wl,--no-whole-archive -Wl,-export-dynamic"
3030
CORE_LIBS="$CORE_LIBS $NGX_LIBDL -lrt"
3131

3232
cat << END > $NGX_MAKEFILE

Diff for: src/event/modules/ans_module.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
#define __USE_GNU
6666

6767
#include <unistd.h>
68-
#include <sched.h>
6968
#include <sys/types.h>
7069
#include <fcntl.h>
7170
#include <sys/syscall.h>
@@ -793,7 +792,7 @@ ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
793792
fd -= ANS_FD_BASE;
794793

795794
ANS_FD_DEBUG("ans fd %d readv with iovcnt %d \n", fd, iovcnt);
796-
rc =anssock_readv(fd, iov, iovcnt);
795+
rc =anssock_readv(fd, iov, iovcnt);
797796
return rc;
798797
}
799798
else

0 commit comments

Comments
 (0)