summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-03-26 14:09:38 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2018-03-28 13:41:15 +0000
commit23d4e8a6b5a3824ef5390061cf3dd7001ca760e8 (patch)
tree9858d5a59e0f42e330c315825cfec0d23d09e193 /extras
parentb3caf557300adc6208a7bb6b985a80ef118c5a9d (diff)
Build libmemif as part of verify job
Change-Id: I7e808b5bcbb74343a4ed6782f115ed07e9bfe3a6 Signed-off-by: Damjan Marion <damarion@cisco.com> Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/libmemif/Makefile.am10
-rw-r--r--extras/libmemif/examples/icmp_responder-epoll/main.c4
-rw-r--r--extras/libmemif/src/main.c2
-rw-r--r--extras/libmemif/src/memif_private.h2
4 files changed, 11 insertions, 7 deletions
diff --git a/extras/libmemif/Makefile.am b/extras/libmemif/Makefile.am
index 759f5c49d3b..8640cf8cdb6 100644
--- a/extras/libmemif/Makefile.am
+++ b/extras/libmemif/Makefile.am
@@ -53,14 +53,14 @@ unit_test_LDADD = $(CHECK_LIBS)
# main lib
#
libmemif_la_SOURCES = src/main.c src/socket.c
-libmemif_la_CPPFLAGS = $(AM_CPPFLAGS) -Isrc
+libmemif_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src
#
# ICMP responder example
#
icmpr_SOURCES = examples/icmp_responder/main.c examples/icmp_responder/icmp_proto.c
icmpr_LDADD = libmemif.la
-icmpr_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
+icmpr_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/examples/icmp_responder
#
# ICMP responder libmemif event polling example
@@ -68,7 +68,7 @@ icmpr_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
icmpr_epoll_SOURCES = examples/icmp_responder-epoll/main.c \
examples/icmp_responder/icmp_proto.c
icmpr_epoll_LDADD = libmemif.la -lpthread
-icmpr_epoll_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
+icmpr_epoll_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/examples/icmp_responder
#
# ICMP responder multi-thread example
@@ -76,11 +76,11 @@ icmpr_epoll_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
icmpr_mt_SOURCES = examples/icmp_responder-mt/main.c \
examples/icmp_responder/icmp_proto.c
icmpr_mt_LDADD = libmemif.la -lpthread
-icmpr_mt_CPPFLAGS = $(AM_CPPFLAGS) -Isrc -Iexamples/icmp_responder
+icmpr_mt_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/examples/icmp_responder
noinst_PROGRAMS = icmpr icmpr-epoll icmpr-mt
-include_HEADERS = src/libmemif.h src/memif.h
+include_HEADERS = src/libmemif.h
lib_LTLIBRARIES = libmemif.la
diff --git a/extras/libmemif/examples/icmp_responder-epoll/main.c b/extras/libmemif/examples/icmp_responder-epoll/main.c
index 6b977a48f5b..1dab51f4f23 100644
--- a/extras/libmemif/examples/icmp_responder-epoll/main.c
+++ b/extras/libmemif/examples/icmp_responder-epoll/main.c
@@ -47,6 +47,10 @@
#include <time.h>
+#ifndef TIME_UTC
+#define TIME_UTC 1
+#endif
+
#include <libmemif.h>
#include <icmp_proto.h>
diff --git a/extras/libmemif/src/main.c b/extras/libmemif/src/main.c
index 42bced67dae..dc4a6231118 100644
--- a/extras/libmemif/src/main.c
+++ b/extras/libmemif/src/main.c
@@ -1346,7 +1346,7 @@ memif_init_regions_and_queues (memif_connection_t * conn)
(conn->run_args.num_s2m_rings + conn->run_args.num_m2s_rings);
if ((r->fd =
- memif_memfd_create ("memif region 0", MFD_ALLOW_SEALING)) == -1)
+ memfd_create ("memif region 0", MFD_ALLOW_SEALING)) == -1)
return memif_syscall_error_handler (errno);
if ((fcntl (r->fd, F_ADD_SEALS, F_SEAL_SHRINK)) == -1)
diff --git a/extras/libmemif/src/memif_private.h b/extras/libmemif/src/memif_private.h
index b1039f9d385..accdac361b9 100644
--- a/extras/libmemif/src/memif_private.h
+++ b/extras/libmemif/src/memif_private.h
@@ -215,7 +215,7 @@ int free_list_elt (memif_list_elt_t * list, uint16_t len, int key);
#ifndef HAVE_MEMFD_CREATE
static inline int
-memif_memfd_create (const char *name, unsigned int flags)
+memfd_create (const char *name, unsigned int flags)
{
return syscall (__NR_memfd_create, name, flags);
}