| Message ID | 1445270883-8069-4-git-send-email-maxim.uvarov@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2015-10-19 19:07, Maxim Uvarov wrote: > Move odph_pause inside linux-generic. Validation test is also useless > with such move. > > Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> > --- > helper/Makefile.am | 4 +--- > helper/ring.c | 2 +- > helper/test/Makefile.am | 4 +--- > helper/test/odph_pause.c | 14 -------------- > platform/linux-generic/Makefile.am | 1 + > .../linux-generic/include/odp_pause_internal.h | 4 ++-- > 6 files changed, 6 insertions(+), 23 deletions(-) > delete mode 100644 helper/test/odph_pause.c > rename helper/odph_pause.h => platform/linux-generic/include/odp_pause_internal.h (93%) If you move odph_pause.h into linux-generic it should go into linux-generic/arch/ Cheers, Anders > > diff --git a/helper/Makefile.am b/helper/Makefile.am > index 1a74e8e..cde8af2 100644 > --- a/helper/Makefile.am > +++ b/helper/Makefile.am > @@ -19,9 +19,7 @@ helperinclude_HEADERS = \ > $(srcdir)/include/odp/helper/tcp.h\ > $(srcdir)/include/odp/helper/udp.h > > -noinst_HEADERS = \ > - $(srcdir)/odph_debug.h \ > - $(srcdir)/odph_pause.h > +noinst_HEADERS = $(srcdir)/odph_debug.h > > __LIB__libodphelper_la_SOURCES = \ > linux.c \ > diff --git a/helper/ring.c b/helper/ring.c > index 844abf7..6bb2bda 100644 > --- a/helper/ring.c > +++ b/helper/ring.c > @@ -71,7 +71,7 @@ > > #include <odp/shared_memory.h> > #include <odp/spinlock.h> > -#include "odph_pause.h" > +#include "odp_pause_internal.h" > #include <odp/align.h> > #include <fcntl.h> > #include <stdio.h> > diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am > index fbf5a9b..7b73602 100644 > --- a/helper/test/Makefile.am > +++ b/helper/test/Makefile.am > @@ -7,8 +7,7 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} > > EXECUTABLES = odp_chksum$(EXEEXT) \ > odp_thread$(EXEEXT) \ > - odp_process$(EXEEXT)\ > - odph_pause$(EXEEXT) > + odp_process$(EXEEXT) > > COMPILE_ONLY = > > @@ -28,4 +27,3 @@ dist_odp_thread_SOURCES = odp_thread.c > odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la > dist_odp_process_SOURCES = odp_process.c > odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la > -odph_pause_SOURCES = odph_pause.c > diff --git a/helper/test/odph_pause.c b/helper/test/odph_pause.c > deleted file mode 100644 > index f5f5da3..0000000 > --- a/helper/test/odph_pause.c > +++ /dev/null > @@ -1,14 +0,0 @@ > -/* Copyright (c) 2015, Linaro Limited > - * All rights reserved. > - * > - * SPDX-License-Identifier: BSD-3-Clause > - */ > - > -#include <test_debug.h> > -#include "../odph_pause.h" > - > -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) > -{ > - odph_pause(); > - return 0; > -} > diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am > index 4c79730..b9ed3b0 100644 > --- a/platform/linux-generic/Makefile.am > +++ b/platform/linux-generic/Makefile.am > @@ -128,6 +128,7 @@ noinst_HEADERS = \ > ${srcdir}/include/odp_packet_io_internal.h \ > ${srcdir}/include/odp_packet_io_queue.h \ > ${srcdir}/include/odp_packet_socket.h \ > + ${srcdir}/include/odp_pause_internal.h \ > ${srcdir}/include/odp_pool_internal.h \ > ${srcdir}/include/odp_queue_internal.h \ > ${srcdir}/include/odp_schedule_internal.h \ > diff --git a/helper/odph_pause.h b/platform/linux-generic/include/odp_pause_internal.h > similarity index 93% > rename from helper/odph_pause.h > rename to platform/linux-generic/include/odp_pause_internal.h > index 5618f1f..ad2c628 100644 > --- a/helper/odph_pause.h > +++ b/platform/linux-generic/include/odp_pause_internal.h > @@ -4,8 +4,8 @@ > * SPDX-License-Identifier: BSD-3-Clause > */ > > -#ifndef ODPH_PAUSE_H_ > -#define ODPH_PAUSE_H_ > +#ifndef ODP_PAUSE_INTERNAL_H_ > +#define ODP_PAUSE_INTERNAL_H_ > > #ifdef __cplusplus > extern "C" { > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/helper/Makefile.am b/helper/Makefile.am index 1a74e8e..cde8af2 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -19,9 +19,7 @@ helperinclude_HEADERS = \ $(srcdir)/include/odp/helper/tcp.h\ $(srcdir)/include/odp/helper/udp.h -noinst_HEADERS = \ - $(srcdir)/odph_debug.h \ - $(srcdir)/odph_pause.h +noinst_HEADERS = $(srcdir)/odph_debug.h __LIB__libodphelper_la_SOURCES = \ linux.c \ diff --git a/helper/ring.c b/helper/ring.c index 844abf7..6bb2bda 100644 --- a/helper/ring.c +++ b/helper/ring.c @@ -71,7 +71,7 @@ #include <odp/shared_memory.h> #include <odp/spinlock.h> -#include "odph_pause.h" +#include "odp_pause_internal.h" #include <odp/align.h> #include <fcntl.h> #include <stdio.h> diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fbf5a9b..7b73602 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -7,8 +7,7 @@ TESTS_ENVIRONMENT += TEST_DIR=${builddir} EXECUTABLES = odp_chksum$(EXEEXT) \ odp_thread$(EXEEXT) \ - odp_process$(EXEEXT)\ - odph_pause$(EXEEXT) + odp_process$(EXEEXT) COMPILE_ONLY = @@ -28,4 +27,3 @@ dist_odp_thread_SOURCES = odp_thread.c odp_thread_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la dist_odp_process_SOURCES = odp_process.c odp_process_LDADD = $(LIB)/libodphelper.la $(LIB)/libodp.la -odph_pause_SOURCES = odph_pause.c diff --git a/helper/test/odph_pause.c b/helper/test/odph_pause.c deleted file mode 100644 index f5f5da3..0000000 --- a/helper/test/odph_pause.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include <test_debug.h> -#include "../odph_pause.h" - -int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED) -{ - odph_pause(); - return 0; -} diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4c79730..b9ed3b0 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -128,6 +128,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_packet_io_internal.h \ ${srcdir}/include/odp_packet_io_queue.h \ ${srcdir}/include/odp_packet_socket.h \ + ${srcdir}/include/odp_pause_internal.h \ ${srcdir}/include/odp_pool_internal.h \ ${srcdir}/include/odp_queue_internal.h \ ${srcdir}/include/odp_schedule_internal.h \ diff --git a/helper/odph_pause.h b/platform/linux-generic/include/odp_pause_internal.h similarity index 93% rename from helper/odph_pause.h rename to platform/linux-generic/include/odp_pause_internal.h index 5618f1f..ad2c628 100644 --- a/helper/odph_pause.h +++ b/platform/linux-generic/include/odp_pause_internal.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef ODPH_PAUSE_H_ -#define ODPH_PAUSE_H_ +#ifndef ODP_PAUSE_INTERNAL_H_ +#define ODP_PAUSE_INTERNAL_H_ #ifdef __cplusplus extern "C" {
Move odph_pause inside linux-generic. Validation test is also useless with such move. Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org> --- helper/Makefile.am | 4 +--- helper/ring.c | 2 +- helper/test/Makefile.am | 4 +--- helper/test/odph_pause.c | 14 -------------- platform/linux-generic/Makefile.am | 1 + .../linux-generic/include/odp_pause_internal.h | 4 ++-- 6 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 helper/test/odph_pause.c rename helper/odph_pause.h => platform/linux-generic/include/odp_pause_internal.h (93%)