This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 92ebb26bae583ff864bc4bef6a2776329527a069 (commit) via ed4e1bfea15d8502e50b6c210f38dd3f13683d2f (commit) via ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 (commit) via a430caf661d4a0ad8d69c67dc7a20911e3169a25 (commit) from fbe07de54f3768f32bd39a0ea9aa2a79188b1186 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 92ebb26bae583ff864bc4bef6a2776329527a069 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Apr 6 16:40:17 2018 +0300
travis: use -M option for generated patches
generate patches with -M (move) option to not validate moved files from stratch.
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/scripts/ci-checkpatches.sh b/scripts/ci-checkpatches.sh index 798efe05..383045cd 100755 --- a/scripts/ci-checkpatches.sh +++ b/scripts/ci-checkpatches.sh @@ -7,14 +7,14 @@ echo "Run checkpatch for ${PATCHES}" # validate only the latest commit if it's not merge commit.
if [ "$PATCHES" = "" ]; then - git format-patch -1 HEAD; + git format-patch -1 -M HEAD; perl ./scripts/checkpatch.pl *.patch; exit $? fi
git show --summary HEAD| grep -q '^Merge:'; if [ $? -ne 0 ]; then - git format-patch -1 HEAD; + git format-patch -1 -M HEAD; perl ./scripts/checkpatch.pl *.patch; exit $? fi
commit ed4e1bfea15d8502e50b6c210f38dd3f13683d2f Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Apr 6 16:21:34 2018 +0300
linux-gen: ishm: remove useless debug print
in case of huge page it is ok that file was not created, no need to generate confusing debug message here.
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c index 3f123c90..5f5e5eef 100644 --- a/platform/linux-generic/odp_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -456,10 +456,7 @@ static int create_file(int block_index, huge_flag_t huge, uint64_t len,
fd = open(filename, oflag, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); if (fd < 0) { - if (huge == HUGE) - ODP_DBG("open failed for %s: %s.\n", - filename, strerror(errno)); - else + if (huge != HUGE) ODP_ERR("open failed for %s: %s.\n", filename, strerror(errno)); return -1;
commit ef5998dfd0ba1405fef6dd1a7f0e9adf686fca89 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Fri Apr 6 16:17:01 2018 +0300
linux-gen: hide debug prints from fd server
Debug prints are very specific to fdserver internals and useless until you debug fdserver code itself. Add option to uncomment this prints if needed.
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c index f8d40ff9..a06fb508 100644 --- a/platform/linux-generic/odp_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -70,6 +70,14 @@ #define MAP_ANONYMOUS MAP_ANON #endif
+#define FD_ODP_DEBUG_PRINT 0 + +#define FD_ODP_DBG(fmt, ...) \ + do { \ + if (FD_ODP_DEBUG_PRINT == 1) \ + ODP_DBG(fmt, ##__VA_ARGS__);\ + } while (0) + /* when accessing the client functions, clients should be mutexed: */ static odp_spinlock_t *client_lock;
@@ -280,8 +288,8 @@ int _odp_fdserver_register_fd(fd_server_context_e context, uint64_t key,
odp_spinlock_lock(client_lock);
- ODP_DBG("FD client register: pid=%d key=%" PRIu64 ", fd=%d\n", - getpid(), key, fd_to_send); + FD_ODP_DBG("FD client register: pid=%d key=%" PRIu64 ", fd=%d\n", + getpid(), key, fd_to_send);
s_sock = get_socket(); if (s_sock < 0) { @@ -326,8 +334,8 @@ int _odp_fdserver_deregister_fd(fd_server_context_e context, uint64_t key)
odp_spinlock_lock(client_lock);
- ODP_DBG("FD client deregister: pid=%d key=%" PRIu64 "\n", - getpid(), key); + FD_ODP_DBG("FD client deregister: pid=%d key=%" PRIu64 "\n", + getpid(), key);
s_sock = get_socket(); if (s_sock < 0) { @@ -413,7 +421,7 @@ static int stop_server(void)
odp_spinlock_lock(client_lock);
- ODP_DBG("FD sending server stop request\n"); + FD_ODP_DBG("FD sending server stop request\n");
s_sock = get_socket(); if (s_sock < 0) { @@ -464,8 +472,8 @@ static int handle_request(int client_sock) fd_table[fd_table_nb_entries].context = context; fd_table[fd_table_nb_entries].key = key; fd_table[fd_table_nb_entries++].fd = fd; - ODP_DBG("storing {ctx=%d, key=%" PRIu64 "}->fd=%d\n", - context, key, fd); + FD_ODP_DBG("storing {ctx=%d, key=%" PRIu64 "}->fd=%d\n", + context, key, fd); } else { ODP_ERR("FD table full\n"); send_fdserver_msg(client_sock, FD_REGISTER_NACK, @@ -517,9 +525,9 @@ static int handle_request(int client_sock) for (i = 0; i < fd_table_nb_entries; i++) { if ((fd_table[i].context == context) && (fd_table[i].key == key)) { - ODP_DBG("drop {ctx=%d," - " key=%" PRIu64 "}->fd=%d\n", - context, key, fd_table[i].fd); + FD_ODP_DBG("drop {ctx=%d," + " key=%" PRIu64 "}->fd=%d\n", + context, key, fd_table[i].fd); close(fd_table[i].fd); fd_table[i] = fd_table[--fd_table_nb_entries]; send_fdserver_msg(client_sock, @@ -535,7 +543,7 @@ static int handle_request(int client_sock) break;
case FD_SERVERSTOP_REQ: - ODP_DBG("Stoping FD server\n"); + FD_ODP_DBG("Stoping FD server\n"); return 1;
default:
commit a430caf661d4a0ad8d69c67dc7a20911e3169a25 Author: Maxim Uvarov maxim.uvarov@linaro.org Date: Thu Apr 5 18:31:08 2018 +0300
linux-gen: clean up ishm file naming
rename ivshmem related files with _<name> prefix to odp_<name> for better fix project code style. No code change, just file renames.
Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7e57994d..4f03eab1 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -82,15 +82,11 @@ endif
noinst_HEADERS = \ arch/odp_arch_time_internal.h \ - include/_fdserver_internal.h \ - include/_ishm_internal.h \ - include/_ishmphy_internal.h \ - include/_ishmpool_internal.h \ include/odp_align_internal.h \ include/odp_atomic_internal.h \ - include/odp_buffer_inlines.h \ include/odp_bitmap_internal.h \ include/odp_bitset.h \ + include/odp_buffer_inlines.h \ include/odp_buffer_internal.h \ include/odp_classification_datamodel.h \ include/odp_classification_inlines.h \ @@ -98,37 +94,41 @@ noinst_HEADERS = \ include/odp_config_internal.h \ include/odp_debug_internal.h \ include/odp_errno_define.h \ + include/odp_fdserver_internal.h \ include/odp_forward_typedefs_internal.h \ include/odp_internal.h \ include/odp_ipsec_internal.h \ + include/odp_ishm_internal.h \ + include/odp_ishmphy_internal.h \ + include/odp_ishmpool_internal.h \ include/odp_libconfig_internal.h \ include/odp_llqueue.h \ include/odp_macros_internal.h \ include/odp_name_table_internal.h \ + include/odp_packet_dpdk.h \ include/odp_packet_internal.h \ include/odp_packet_io_internal.h \ include/odp_packet_io_ipc_internal.h \ include/odp_packet_io_ring_internal.h \ include/odp_packet_netmap.h \ - include/odp_packet_dpdk.h \ + include/odp_packet_null.h \ include/odp_packet_socket.h \ include/odp_packet_tap.h \ - include/odp_packet_null.h \ include/odp_pkt_queue_internal.h \ include/odp_pool_internal.h \ include/odp_posix_extensions.h \ - include/odp_queue_internal.h \ - include/odp_queue_scalable_internal.h \ include/odp_queue_if.h \ + include/odp_queue_internal.h \ include/odp_queue_lf.h \ + include/odp_queue_scalable_internal.h \ include/odp_ring_internal.h \ include/odp_ring_st_internal.h \ include/odp_schedule_if.h \ - include/odp_schedule_scalable.h \ include/odp_schedule_scalable_config.h \ + include/odp_schedule_scalable.h \ include/odp_schedule_scalable_ordered.h \ - include/odp_sorted_list_internal.h \ include/odp_shm_internal.h \ + include/odp_sorted_list_internal.h \ include/odp_timer_internal.h \ include/odp_timer_wheel_internal.h \ include/odp_traffic_mngr_internal.h \ @@ -138,15 +138,10 @@ noinst_HEADERS = \ include/protocols/tcp.h \ include/protocols/thash.h \ include/protocols/udp.h - nodist_noinst_HEADERS = \ include/odp_libconfig_config.h
__LIB__libodp_linux_la_SOURCES = \ - _fdserver.c \ - _ishm.c \ - _ishmphy.c \ - _ishmpool.c \ odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ @@ -159,30 +154,21 @@ __LIB__libodp_linux_la_SOURCES = \ odp_crypto.c \ odp_errno.c \ odp_event.c \ + odp_fdserver.c \ odp_hash.c \ - odp_init.c \ odp_impl.c \ + odp_init.c \ odp_ipsec.c \ odp_ipsec_events.c \ odp_ipsec_sad.c \ + odp_ishm.c \ + odp_ishmphy.c \ + odp_ishmpool.c \ odp_libconfig.c \ odp_name_table.c \ odp_packet.c \ odp_packet_flags.c \ odp_packet_io.c \ - pktio/ethtool.c \ - pktio/io_ops.c \ - pktio/ipc.c \ - pktio/pktio_common.c \ - pktio/loop.c \ - pktio/netmap.c \ - pktio/null.c \ - pktio/dpdk.c \ - pktio/socket.c \ - pktio/socket_mmap.c \ - pktio/sysfs.c \ - pktio/tap.c \ - pktio/ring.c \ odp_pkt_queue.c \ odp_pool.c \ odp_queue_basic.c \ @@ -193,10 +179,10 @@ __LIB__libodp_linux_la_SOURCES = \ odp_rwlock_recursive.c \ odp_schedule_basic.c \ odp_schedule_if.c \ - odp_schedule_sp.c \ odp_schedule_iquery.c \ odp_schedule_scalable.c \ odp_schedule_scalable_ordered.c \ + odp_schedule_sp.c \ odp_shared_memory.c \ odp_sorted_list.c \ odp_spinlock.c \ @@ -209,8 +195,20 @@ __LIB__libodp_linux_la_SOURCES = \ odp_timer_wheel.c \ odp_traffic_mngr.c \ odp_version.c \ - odp_weak.c - + odp_weak.c \ + pktio/dpdk.c \ + pktio/ethtool.c \ + pktio/io_ops.c \ + pktio/ipc.c \ + pktio/loop.c \ + pktio/netmap.c \ + pktio/null.c \ + pktio/pktio_common.c \ + pktio/ring.c \ + pktio/socket.c \ + pktio/socket_mmap.c \ + pktio/sysfs.c \ + pktio/tap.c if ODP_ABI_COMPAT __LIB__libodp_linux_la_SOURCES += \ odp_atomic_api.c \ diff --git a/platform/linux-generic/include/_fdserver_internal.h b/platform/linux-generic/include/odp_fdserver_internal.h similarity index 100% rename from platform/linux-generic/include/_fdserver_internal.h rename to platform/linux-generic/include/odp_fdserver_internal.h diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/odp_ishm_internal.h similarity index 100% rename from platform/linux-generic/include/_ishm_internal.h rename to platform/linux-generic/include/odp_ishm_internal.h diff --git a/platform/linux-generic/include/_ishmphy_internal.h b/platform/linux-generic/include/odp_ishmphy_internal.h similarity index 100% rename from platform/linux-generic/include/_ishmphy_internal.h rename to platform/linux-generic/include/odp_ishmphy_internal.h diff --git a/platform/linux-generic/include/_ishmpool_internal.h b/platform/linux-generic/include/odp_ishmpool_internal.h similarity index 100% rename from platform/linux-generic/include/_ishmpool_internal.h rename to platform/linux-generic/include/odp_ishmpool_internal.h diff --git a/platform/linux-generic/include/odp_schedule_scalable_ordered.h b/platform/linux-generic/include/odp_schedule_scalable_ordered.h index fb4720a5..17d4f7ea 100644 --- a/platform/linux-generic/include/odp_schedule_scalable_ordered.h +++ b/platform/linux-generic/include/odp_schedule_scalable_ordered.h @@ -14,7 +14,7 @@ #include <odp_internal.h> #include <odp_align_internal.h> #include <odp_bitset.h> -#include <_ishmpool_internal.h> +#include <odp_ishmpool_internal.h>
/* High level functioning of reordering * Datastructures - diff --git a/platform/linux-generic/_fdserver.c b/platform/linux-generic/odp_fdserver.c similarity index 99% rename from platform/linux-generic/_fdserver.c rename to platform/linux-generic/odp_fdserver.c index af9ca4a0..f8d40ff9 100644 --- a/platform/linux-generic/_fdserver.c +++ b/platform/linux-generic/odp_fdserver.c @@ -42,7 +42,7 @@ #include <odp/api/spinlock.h> #include <odp_internal.h> #include <odp_debug_internal.h> -#include <_fdserver_internal.h> +#include <odp_fdserver_internal.h> #include <sys/prctl.h> #include <signal.h>
diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/odp_ishm.c similarity index 99% rename from platform/linux-generic/_ishm.c rename to platform/linux-generic/odp_ishm.c index ab112ace..3f123c90 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/odp_ishm.c @@ -57,10 +57,10 @@ #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_fdserver_internal.h> -#include <_ishm_internal.h> -#include <_ishmphy_internal.h> -#include <_ishmpool_internal.h> +#include <odp_fdserver_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmphy_internal.h> +#include <odp_ishmpool_internal.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/platform/linux-generic/_ishmphy.c b/platform/linux-generic/odp_ishmphy.c similarity index 98% rename from platform/linux-generic/_ishmphy.c rename to platform/linux-generic/odp_ishmphy.c index 8dde2831..6207ce75 100644 --- a/platform/linux-generic/_ishmphy.c +++ b/platform/linux-generic/odp_ishmphy.c @@ -18,8 +18,8 @@ #include <odp/api/debug.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_ishm_internal.h> -#include <_ishmphy_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmphy_internal.h>
#include <stdlib.h> #include <stdio.h> @@ -31,7 +31,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/wait.h> -#include <_ishmphy_internal.h> +#include <odp_ishmphy_internal.h>
static void *common_va_address; static uint64_t common_va_len; diff --git a/platform/linux-generic/_ishmpool.c b/platform/linux-generic/odp_ishmpool.c similarity index 99% rename from platform/linux-generic/_ishmpool.c rename to platform/linux-generic/odp_ishmpool.c index 4ff24c02..04a0e535 100644 --- a/platform/linux-generic/_ishmpool.c +++ b/platform/linux-generic/odp_ishmpool.c @@ -51,8 +51,8 @@ #include <odp_shm_internal.h> #include <odp_debug_internal.h> #include <odp_align_internal.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h> #include <stdlib.h> #include <stdio.h> #include <unistd.h> diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c index 895133cd..2a5e01d4 100644 --- a/platform/linux-generic/odp_queue_scalable.c +++ b/platform/linux-generic/odp_queue_scalable.c @@ -25,8 +25,8 @@ #include <odp_pool_internal.h> #include <odp_queue_scalable_internal.h> #include <odp_schedule_if.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h>
#include <string.h> #include <inttypes.h> diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c index f5974442..023ab1ed 100644 --- a/platform/linux-generic/odp_schedule_scalable.c +++ b/platform/linux-generic/odp_schedule_scalable.c @@ -21,8 +21,8 @@ #include <odp_internal.h> #include <odp_config_internal.h> #include <odp_debug_internal.h> -#include <_ishm_internal.h> -#include <_ishmpool_internal.h> +#include <odp_ishm_internal.h> +#include <odp_ishmpool_internal.h>
#include <odp_align_internal.h> #include <odp_buffer_inlines.h> diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index c9b04dfd..edf261af 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -11,7 +11,7 @@ #include <odp/api/std_types.h> #include <odp/api/shared_memory.h> #include <odp/api/plat/strong_types.h> -#include <_ishm_internal.h> +#include <odp_ishm_internal.h> #include <odp_internal.h> #include <string.h>
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index 6dcc7a59..08e3e4bc 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -11,7 +11,7 @@ #include <odp_packet_io_internal.h> #include <odp/api/system_info.h> #include <odp_shm_internal.h> -#include <_ishm_internal.h> +#include <odp_ishm_internal.h>
#include <sys/mman.h> #include <sys/stat.h>
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/Makefile.am | 64 +++++++++++----------- ...fdserver_internal.h => odp_fdserver_internal.h} | 0 .../{_ishm_internal.h => odp_ishm_internal.h} | 0 ...{_ishmphy_internal.h => odp_ishmphy_internal.h} | 0 ...ishmpool_internal.h => odp_ishmpool_internal.h} | 0 .../include/odp_schedule_scalable_ordered.h | 2 +- .../linux-generic/{_fdserver.c => odp_fdserver.c} | 32 +++++++---- platform/linux-generic/{_ishm.c => odp_ishm.c} | 13 ++--- .../linux-generic/{_ishmphy.c => odp_ishmphy.c} | 6 +- .../linux-generic/{_ishmpool.c => odp_ishmpool.c} | 4 +- platform/linux-generic/odp_queue_scalable.c | 4 +- platform/linux-generic/odp_schedule_scalable.c | 4 +- platform/linux-generic/odp_shared_memory.c | 2 +- platform/linux-generic/pktio/ipc.c | 2 +- scripts/ci-checkpatches.sh | 4 +- 15 files changed, 70 insertions(+), 67 deletions(-) rename platform/linux-generic/include/{_fdserver_internal.h => odp_fdserver_internal.h} (100%) rename platform/linux-generic/include/{_ishm_internal.h => odp_ishm_internal.h} (100%) rename platform/linux-generic/include/{_ishmphy_internal.h => odp_ishmphy_internal.h} (100%) rename platform/linux-generic/include/{_ishmpool_internal.h => odp_ishmpool_internal.h} (100%) rename platform/linux-generic/{_fdserver.c => odp_fdserver.c} (96%) rename platform/linux-generic/{_ishm.c => odp_ishm.c} (99%) rename platform/linux-generic/{_ishmphy.c => odp_ishmphy.c} (98%) rename platform/linux-generic/{_ishmpool.c => odp_ishmpool.c} (99%)
hooks/post-receive
-
git＠git-us.linaro.org