From patchwork Fri Jan 27 14:29:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92652 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp228890obz; Fri, 27 Jan 2017 06:30:48 -0800 (PST) X-Received: by 10.200.56.187 with SMTP id f56mr7822424qtc.234.1485527448772; Fri, 27 Jan 2017 06:30:48 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 201si3652449qkd.51.2017.01.27.06.30.48; Fri, 27 Jan 2017 06:30:48 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6E113609EA; Fri, 27 Jan 2017 14:30:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A81BF60D1F; Fri, 27 Jan 2017 14:29:56 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 07EAB609D7; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: from mail-lf0-f47.google.com (mail-lf0-f47.google.com [209.85.215.47]) by lists.linaro.org (Postfix) with ESMTPS id 7AB38609AD for ; Fri, 27 Jan 2017 14:29:47 +0000 (UTC) Received: by mail-lf0-f47.google.com with SMTP id x1so76115164lff.0 for ; Fri, 27 Jan 2017 06:29:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mxDoZ7WLwcHQWoker6v5cyWMS5je/uldNIW7E3A7Zis=; b=uJcEhT4HWof55pzgU52crZoBhVnQe39T5cmLgTrZzVcbMMQf2bsespQr3JwHPdS26p eDtTsNJqoagR2J+wHo+bE2f03d+J0ezXKEQMM7nLCLhXu6PANuYEFfneJS+6rH8vLu1j tKhU1LU6RNRYUEER5ls/u4fk3Y725MhGTjyEB7c0vuwS4/e81ZIE4V/yUUCWvWrf8cAM RpKNbgRrF4cATzKhwwG1OHPURaK/Bx55kcdXcb6CgoMob+rkhekqwoiFjA7Q5aRvwaUh nKRSXCFKqWFtY2tFEG7Y9XfbWwuOD5cLzbCmctewkK1X9P3dexTA6bn2URx1DCKRxtli EmDA== X-Gm-Message-State: AIkVDXIXyV4AW0ixtwQvyGVFh4nk8UtspDddnPp+zbGklIYkbZe8n6qRwN+IhYNNrILQTR85d3I= X-Received: by 10.25.21.142 with SMTP id 14mr2904540lfv.138.1485527386035; Fri, 27 Jan 2017 06:29:46 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:45 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:07 +0300 Message-Id: <20170127142921.29029-2-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 01/15] merge fix: platform/linux-generic/Makefile.am X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/Makefile.am | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e791603c..90024bda 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -20,11 +20,6 @@ odpinclude_HEADERS = \ $(srcdir)/include/odp/visibility_begin.h \ $(srcdir)/include/odp/visibility_end.h -odpincludedir= $(includedir)/odp -odpinclude_HEADERS = \ - $(srcdir)/include/odp/visibility_begin.h \ - $(srcdir)/include/odp/visibility_end.h - odpapiincludedir= $(includedir)/odp/api odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/align.h \ @@ -110,7 +105,6 @@ odpapiplatinclude_HEADERS = \ odpdrvincludedir = $(includedir)/odp/drv odpdrvinclude_HEADERS = \ -<<<<<<< HEAD $(srcdir)/include/odp/drv/align.h \ $(srcdir)/include/odp/drv/atomic.h \ $(srcdir)/include/odp/drv/barrier.h \ @@ -127,22 +121,17 @@ odpdrvplatinclude_HEADERS = \ $(srcdir)/include/odp/drv/plat/atomic_types.h \ $(srcdir)/include/odp/drv/plat/barrier_types.h \ $(srcdir)/include/odp/drv/plat/byteorder_types.h \ + $(srcdir)/include/odp/drv/compiler.h \ $(srcdir)/include/odp/drv/plat/driver_types.h \ $(srcdir)/include/odp/drv/plat/shm_types.h \ $(srcdir)/include/odp/drv/plat/spinlock_types.h \ $(srcdir)/include/odp/drv/plat/strong_types.h -======= - $(srcdir)/include/odp/drv/compiler.h ->>>>>>> v1.13.0.0 noinst_HEADERS = \ ${srcdir}/include/_fdserver_internal.h \ ${srcdir}/include/_ishm_internal.h \ ${srcdir}/include/_ishmphy_internal.h \ -<<<<<<< HEAD ${srcdir}/include/_ishmpool_internal.h \ -======= ->>>>>>> v1.13.0.0 ${srcdir}/include/odp_align_internal.h \ ${srcdir}/include/odp_atomic_internal.h \ ${srcdir}/include/odp_buffer_inlines.h \ @@ -188,11 +177,8 @@ __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ _ishm.c \ _ishmphy.c \ -<<<<<<< HEAD _ishmpool.c \ _modules.c \ -======= ->>>>>>> v1.13.0.0 odp_atomic.c \ odp_barrier.c \ odp_bitmap.c \ From patchwork Fri Jan 27 14:29:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92653 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229176obz; Fri, 27 Jan 2017 06:31:23 -0800 (PST) X-Received: by 10.200.45.144 with SMTP id p16mr7783996qta.141.1485527483141; Fri, 27 Jan 2017 06:31:23 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q1si3643642qtq.167.2017.01.27.06.31.22; Fri, 27 Jan 2017 06:31:23 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id CB5B462E14; Fri, 27 Jan 2017 14:31:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E3FC260D6C; Fri, 27 Jan 2017 14:29:57 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5A342609AC; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 5CA23609AC for ; Fri, 27 Jan 2017 14:29:48 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id z134so162790528lff.3 for ; Fri, 27 Jan 2017 06:29:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IasVUv/t5/YLUjVwPrJQEy/OxmzqaVRZvuy8z+ePB6o=; b=s9V8RM2Mj77dz/XwX9SG1pfOO7TyGQEsB3Iy54laJMV0etaGbhHVkO+AOWgWt+XRGz CWuyt+e2ZRraU6CCdK1JxwJ5sF67At1apEPJRFj3tK5pAOWBT+/ntAxPE6dChuR1gxdd KDPAtavLRXHkEMsD+SRwu4ZvBJgUOJ5sMIqNnqd6H7ggl/GMlltG8VeVRG/EXIvmgd0V ClRxB4d3VW9qm2P4bB+c8f5NjBKx/hBF9Ie4AYfD8QfRMEBB9PyunlIapsIZ3fbIjdBk 8efRfoXV0Q6OJ0v6E/YStxUwiY37Cxm/Q7y8/wS3CWIcNhzZQ5a5+smJVQhx76WGq1B1 0/yw== X-Gm-Message-State: AIkVDXIvcAZ6ZUSM/B4POkp0eqTrFICCxGcXH4CsUz1fjqQFqUbWmv4zNFdPwt+zFAwlHDJ8KbU= X-Received: by 10.25.17.29 with SMTP id g29mr2612972lfi.10.1485527387197; Fri, 27 Jan 2017 06:29:47 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:46 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:08 +0300 Message-Id: <20170127142921.29029-3-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 02/15] merge fix: doc/driver-api-guide/Doxyfile X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" --- doc/driver-api-guide/Doxyfile | 10 ---------- 1 file changed, 10 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/doc/driver-api-guide/Doxyfile b/doc/driver-api-guide/Doxyfile index e3d3f920..b5f7260e 100644 --- a/doc/driver-api-guide/Doxyfile +++ b/doc/driver-api-guide/Doxyfile @@ -5,7 +5,6 @@ PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.svg INPUT = $(SRCDIR)/doc/driver-api-guide \ $(SRCDIR)/include/odp/drv \ -<<<<<<< HEAD $(SRCDIR)/platform/$(WITH_PLATFORM)/include/odp/drv \ $(SRCDIR)/include/odp_drv.h PREDEFINED = __GNUC__ \ @@ -16,12 +15,3 @@ PREDEFINED = __GNUC__ \ __x86_64__ \ ODPDRV_PACKED \ "ODPDRV_HANDLE_T(type)=odpdrv_handle_t type" -======= - $(SRCDIR)/include/odp_drv.h -EXCLUDE_PATTERNS = drv* odp_drv.h -EXAMPLE_PATH = $(SRCDIR)/example $(SRCDIR) -PREDEFINED = __GNUC__ \ - "ODP_HANDLE_T(type)=odp_handle_t type" \ - odpdrv_bool_t=int -WARNINGS = NO ->>>>>>> v1.13.0.0 From patchwork Fri Jan 27 14:29:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92654 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229459obz; Fri, 27 Jan 2017 06:31:55 -0800 (PST) X-Received: by 10.55.141.5 with SMTP id p5mr9216686qkd.36.1485527515759; Fri, 27 Jan 2017 06:31:55 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k28si3645128qtf.116.2017.01.27.06.31.55; Fri, 27 Jan 2017 06:31:55 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1F91162E01; Fri, 27 Jan 2017 14:31:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 2072360D7B; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 71273609AD; Fri, 27 Jan 2017 14:29:50 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id 61852609AD for ; Fri, 27 Jan 2017 14:29:49 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id n124so162425734lfd.2 for ; Fri, 27 Jan 2017 06:29:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W75vQSEST9FchoknfMMp5/+Uh8PVdM5tLGmCVbIJSrA=; b=iZzSTBKwO33r8a4RYBTayya5zBnhu6dlzs3qnhrkFxLmRMuz4O96l68odFfV1Yfy63 6skK2HdquAdwQomlGMKDyEr51fZLNgt5fmdz4IC5DoD4V9Gt2ohIQRhdsLPwmGJFiZw7 NTg9U/dlc13nukIUfioJPppXiyUaBOU5bkgtRYorm4QahrRSYdptCi6IR88M1tduevhJ uudwq6x+hsOHj7OWHR3/JQ/rE+ikKLo1CpEU1SrgscejVd0Xw/n3GlSsY0TAwzHIkUcI JQMquF9Ap/cfFa2W6fOrGb77WXhAXaDTA9jCy8ZLAJKUCwWZxqOi28UajgXQHRGd6MWi bMzg== X-Gm-Message-State: AIkVDXK7CtZF+zecxjxxABlYQHqve6VhFxDumIHQtX4YOBhqaaaUUR0pfnlDeoPME6SQ6hpXcDI= X-Received: by 10.25.228.157 with SMTP id x29mr2536169lfi.125.1485527388111; Fri, 27 Jan 2017 06:29:48 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:47 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:09 +0300 Message-Id: <20170127142921.29029-4-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 03/15] merge fix: _ishm X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/_ishm.c | 21 --------------------- platform/linux-generic/include/odp_internal.h | 6 ------ 2 files changed, 27 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 038ba1e6..4c2578b1 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -52,20 +52,14 @@ #include #include #include -<<<<<<< HEAD #include -======= ->>>>>>> v1.13.0.0 #include #include #include #include <_fdserver_internal.h> #include <_ishm_internal.h> #include <_ishmphy_internal.h> -<<<<<<< HEAD #include <_ishmpool_internal.h> -======= ->>>>>>> v1.13.0.0 #include #include #include @@ -88,22 +82,12 @@ * if some of the block ownwers never procsync() after free). This number * should take that into account) */ -<<<<<<< HEAD #define ISHM_MAX_NB_BLOCKS ODPDRV_CONFIG_SHM_BLOCKS /* * Maximum internal shared memory block name length in chars */ #define ISHM_NAME_MAXLEN ODPDRV_SHM_NAME_LEN -======= -#define ISHM_MAX_NB_BLOCKS 128 - -/* - * Maximum internal shared memory block name length in chars - * probably taking the same number as SHM name size make sense at this stage - */ -#define ISHM_NAME_MAXLEN 32 ->>>>>>> v1.13.0.0 /* * Linux underlying file name: /odp--ishm- @@ -1458,7 +1442,6 @@ int _odp_ishm_init_global(void) * is performed for the main thread... Many init_global() functions * indeed assume the availability of odp_shm_reserve()...: */ -<<<<<<< HEAD if (do_odp_ishm_init_local()) { ODP_ERR("unable to init the main thread\n."); goto init_glob_err4; @@ -1472,10 +1455,6 @@ int _odp_ishm_init_global(void) init_glob_err4: if (_odp_ishmphy_unbook_va()) ODP_ERR("unable to unbook virtual space\n."); -======= - return do_odp_ishm_init_local(); - ->>>>>>> v1.13.0.0 init_glob_err3: if (munmap(ishm_ftbl, sizeof(ishm_ftable_t)) < 0) ODP_ERR("unable to munmap main fragment table\n."); diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index 7abfd862..05c8a422 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -51,10 +51,7 @@ struct odp_global_data_s { odp_cpumask_t control_cpus; odp_cpumask_t worker_cpus; int num_cpus_installed; -<<<<<<< HEAD config_t configuration; -======= ->>>>>>> v1.13.0.0 }; enum init_stage { @@ -133,11 +130,8 @@ int _odp_ishm_init_local(void); int _odp_ishm_term_global(void); int _odp_ishm_term_local(void); -<<<<<<< HEAD int _odp_modules_init_global(void); -======= ->>>>>>> v1.13.0.0 int cpuinfo_parser(FILE *file, system_info_t *sysinfo); uint64_t odp_cpu_hz_current(int id); From patchwork Fri Jan 27 14:29:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92655 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp229760obz; Fri, 27 Jan 2017 06:32:34 -0800 (PST) X-Received: by 10.37.161.2 with SMTP id z2mr1685893ybh.50.1485527554008; Fri, 27 Jan 2017 06:32:34 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t20si1405398ywh.144.2017.01.27.06.32.33; Fri, 27 Jan 2017 06:32:33 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9DB2F609EF; Fri, 27 Jan 2017 14:32:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8494E60DCC; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id F126D609AC; Fri, 27 Jan 2017 14:29:51 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id E77BA609AC for ; Fri, 27 Jan 2017 14:29:50 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id z134so162791168lff.3 for ; Fri, 27 Jan 2017 06:29:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PuDtBgj40pTaIeJKIfluRgCOBEzTfpzrWqhCuOikBzc=; b=TtDmXSlg12A+3k25Ueyn8YsQG8qlqGpe3bYkcUPlIH+2Tf1Uif1mHI13MU7fKFm8pM edhJb9IxL02bYDbt42/nEkEIYnQUr/6DTH5qnjMyek3Nk4ivPGfXMKkSXfQQagoUotiu qYw1rVPDN7OeE0x5Kdcf4sHz30rHLPsMeCOcbvu0/tQHCHgnbMvUCCBWRGR5hMiMo16b tYDDNmyYN9tpJjLtlfBUmFwHI5mscbLTYH6GlGBuIY1fewAS91pum0fMD6mlVas7aTqg bXhoRxsAgEaJ9M5WqfAmgmcjBhqhd7BhsORDhVjLtTiZ9NumMOwU2OUQEAEVJ5ZULWVi 2d+Q== X-Gm-Message-State: AIkVDXK6dq2gM5NO2gubHMPE3uCwZXOsmyCXhIqummVFBaxsNI0lTO3VdXvLfUPwprjQzjoUDyY= X-Received: by 10.46.1.153 with SMTP id f25mr3121224lji.47.1485527389425; Fri, 27 Jan 2017 06:29:49 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:48 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:10 +0300 Message-Id: <20170127142921.29029-5-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 04/15] merge fix: odp_config_internal.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" --- .../linux-generic/include/odp_config_internal.h | 66 ++++++---------------- 1 file changed, 16 insertions(+), 50 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h index 64996f85..dadd59e7 100644 --- a/platform/linux-generic/include/odp_config_internal.h +++ b/platform/linux-generic/include/odp_config_internal.h @@ -76,7 +76,6 @@ extern "C" { * Maximum number of segments per packet */ #define CONFIG_PACKET_MAX_SEGS 6 -<<<<<<< HEAD /* * Maximum packet segment size including head- and tailrooms @@ -91,41 +90,6 @@ extern "C" { #define CONFIG_PACKET_MAX_SEG_LEN (CONFIG_PACKET_SEG_SIZE - \ CONFIG_PACKET_HEADROOM - \ CONFIG_PACKET_TAILROOM) -======= ->>>>>>> v1.13.0.0 - -/* - * Maximum packet segment size including head- and tailrooms - */ -<<<<<<< HEAD -#define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN - -/* Maximum number of shared memory blocks. - * - * This the the number of separate SHM areas that can be reserved concurrently - */ -#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48) - -/* - * Size of the virtual address space pre-reserver for ISHM - * - * This is just virtual space preallocation size, not memory allocation. - * This address space is used by ISHM to map things at a common address in - * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). - * In bytes. - */ -#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) -======= -#define CONFIG_PACKET_SEG_SIZE (8 * 1024) - -/* Maximum data length in a segment - * - * The user defined segment length (seg_len in odp_pool_param_t) must not - * be larger than this. -*/ -#define CONFIG_PACKET_MAX_SEG_LEN (CONFIG_PACKET_SEG_SIZE - \ - CONFIG_PACKET_HEADROOM - \ - CONFIG_PACKET_TAILROOM) /* * Minimum packet segment length @@ -135,7 +99,22 @@ extern "C" { * this value. */ #define CONFIG_PACKET_SEG_LEN_MIN CONFIG_PACKET_MAX_SEG_LEN ->>>>>>> v1.13.0.0 + +/* Maximum number of shared memory blocks. + * + * This the the number of separate SHM areas that can be reserved concurrently + */ +#define ODP_CONFIG_SHM_BLOCKS (ODP_CONFIG_POOLS + 48) + +/* + * Size of the virtual address space pre-reserver for ISHM + * + * This is just virtual space preallocation size, not memory allocation. + * This address space is used by ISHM to map things at a common address in + * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). + * In bytes. + */ +#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) /* Maximum number of shared memory blocks available on the driver interface. * @@ -160,19 +139,6 @@ extern "C" { */ #define CONFIG_POOL_CACHE_SIZE 256 -<<<<<<< HEAD -======= -/* - * Size of the virtual address space pre-reserver for ISHM - * - * This is just virtual space preallocation size, not memory allocation. - * This address space is used by ISHM to map things at a common address in - * all ODP threads (when the _ODP_ISHM_SINGLE_VA flag is used). - * In bytes. - */ -#define ODP_CONFIG_ISHM_VA_PREALLOC_SZ (536870912L) - ->>>>>>> v1.13.0.0 #ifdef __cplusplus } #endif From patchwork Fri Jan 27 14:29:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92656 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230003obz; Fri, 27 Jan 2017 06:33:12 -0800 (PST) X-Received: by 10.36.46.5 with SMTP id i5mr3448582ita.23.1485527592348; Fri, 27 Jan 2017 06:33:12 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b187si1790352itc.36.2017.01.27.06.33.12; Fri, 27 Jan 2017 06:33:12 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D31E360DD0; Fri, 27 Jan 2017 14:33:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id E258160DED; Fri, 27 Jan 2017 14:30:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id AABA5609D7; Fri, 27 Jan 2017 14:29:52 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id CFCAD609AD for ; Fri, 27 Jan 2017 14:29:51 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id n124so162426358lfd.2 for ; Fri, 27 Jan 2017 06:29:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WQUreD2KrdMIIVEjD5aUcFDehEcxDhh50TLAAwJ/yZs=; b=F5axJZzR1sCzzkU/DTn+2+HXVwIIpFaEVGkEtH79ONCDBh46V4FMaqRlbw9JC7Vd7R gfoSKxeFiJaGlL2m1WzQEpc3UPvEjaeWojbRpdIXIY1bAEXDkNiTf4hnSXaSS21Gh8ad xMDxO/geB6DkiZLBamAuhZoD6DcdlA5OxSKQ4tR3ZqJoblxaP2QPgBx6T+fzdWYGRnuZ eFUxF6wZ3/QreUFx40NJpUcLHW29K6rofaq5RIqLT30Xuv7MCnuQwXMniq/pNjE/bNWI O0ibDDn1cUU+xcdrEbk3P4xb57wDGUniH4TWHKhlt507QKKGwTr35oeHvJDwepzTqBAY 4eaA== X-Gm-Message-State: AIkVDXIxw5k1qQVu6tE6+fWhAesaZ0wXV0KnhRzqVPLvqi4qDnde8EZssV5iV3pP3cuLel3au2s= X-Received: by 10.46.14.18 with SMTP id 18mr3076901ljo.67.1485527390404; Fri, 27 Jan 2017 06:29:50 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:49 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:11 +0300 Message-Id: <20170127142921.29029-6-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 05/15] merge fix: odp_schedule_if.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/include/odp_schedule_if.h | 6 ------ 1 file changed, 6 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h index d1cbf988..530d157f 100644 --- a/platform/linux-generic/include/odp_schedule_if.h +++ b/platform/linux-generic/include/odp_schedule_if.h @@ -35,10 +35,7 @@ typedef int (*schedule_term_local_fn_t)(void); typedef void (*schedule_order_lock_fn_t)(void); typedef void (*schedule_order_unlock_fn_t)(void); typedef unsigned (*schedule_max_ordered_locks_fn_t)(void); -<<<<<<< HEAD typedef void (*schedule_save_context_fn_t)(queue_entry_t *queue); -======= ->>>>>>> v1.13.0.0 typedef struct schedule_fn_t { schedule_pktio_start_fn_t pktio_start; @@ -57,10 +54,7 @@ typedef struct schedule_fn_t { schedule_order_lock_fn_t order_lock; schedule_order_unlock_fn_t order_unlock; schedule_max_ordered_locks_fn_t max_ordered_locks; -<<<<<<< HEAD schedule_save_context_fn_t save_context; -======= ->>>>>>> v1.13.0.0 } schedule_fn_t; /* Interface towards the scheduler */ From patchwork Fri Jan 27 14:29:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92657 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230229obz; Fri, 27 Jan 2017 06:33:43 -0800 (PST) X-Received: by 10.36.252.65 with SMTP id b62mr3172454ith.38.1485527623588; Fri, 27 Jan 2017 06:33:43 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t68si1806093ita.12.2017.01.27.06.33.43; Fri, 27 Jan 2017 06:33:43 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0E18160D72; Fri, 27 Jan 2017 14:33:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 1F96E62DFA; Fri, 27 Jan 2017 14:30:06 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0FB1160A27; Fri, 27 Jan 2017 14:29:54 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id 8051E609AC for ; Fri, 27 Jan 2017 14:29:52 +0000 (UTC) Received: by mail-lf0-f54.google.com with SMTP id x1so76116444lff.0 for ; Fri, 27 Jan 2017 06:29:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=656yjR6JPdxnfMJgtcJYYQhVBPCgvrdsv6/JOruDomE=; b=BMdmd4gpUwWvVTtiuCrs53pXtuA+oT8y3XdmwmswSkMealv1Ir7ikd/jlDGY0Bvqve FW9yRPBqmMZG8qrIeQXXSfxvEwiVC+BViYqPum3v0BTqzqtWqeJ9WRxCcbS9i0A0zHOf XBsczYnGXA/9v91zJsgxKpCYh/EfK7tQxh+6gqtiCR/SsIzBtXaznTQqz7CwBtbqgmWE ktQmC5NH4CiP3KBL76sbLl59Jr/GNySAQEp4RyEgKHQIQHBnHplMDjnOFmzUlI4b331i MP/vmFTysJazrNsZJasqKmGqeqSXE8a98Uy7MGHPG8T2Zw8l/CPGeZEH95BsowNUbekt yaZg== X-Gm-Message-State: AIkVDXKdSInnw/jQBYxnLrLXqFn6kWs7Mlas7wTyJXQFKT9fGI1nc+IjDMQPLp8l8kvbXIZGWKU= X-Received: by 10.46.7.10 with SMTP id 10mr3277111ljh.58.1485527391389; Fri, 27 Jan 2017 06:29:51 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:50 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:12 +0300 Message-Id: <20170127142921.29029-7-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 06/15] merge fix: odp_packet_internal.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- .../linux-generic/include/odp_packet_internal.h | 25 ---------------------- 1 file changed, 25 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 9ba5b58b..c5dc989d 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -185,7 +185,6 @@ typedef struct odp_packet_hdr_t { uint32_t headroom; uint32_t tailroom; -<<<<<<< HEAD /* Fields used to support packet references */ uint32_t unshared_len; struct odp_packet_hdr_t *ref_hdr; @@ -206,21 +205,6 @@ typedef struct odp_packet_hdr_t { /* Classifier destination queue */ odp_queue_t dst_queue; -======= - /* - * Members below are not initialized by packet_init() - */ - - /* Flow hash value */ - uint32_t flow_hash; - - /* Timestamp value */ - odp_time_t timestamp; - - /* Classifier destination queue */ - odp_queue_t dst_queue; - ->>>>>>> v1.13.0.0 /* Result for crypto */ odp_crypto_generic_op_result_t op_result; @@ -258,7 +242,6 @@ static inline odp_packet_hdr_t *odp_packet_last_hdr(odp_packet_t pkt, return pkt_hdr; } -<<<<<<< HEAD static inline odp_packet_hdr_t *odp_packet_prev_hdr(odp_packet_hdr_t *pkt_hdr, odp_packet_hdr_t *cur_hdr, uint32_t *offset) @@ -304,15 +287,10 @@ static inline void copy_packet_cls_metadata(odp_packet_hdr_t *src_hdr, static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) { -======= -static inline void pull_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) -{ ->>>>>>> v1.13.0.0 int last = pkt_hdr->buf_hdr.segcount - 1; pkt_hdr->tailroom += len; pkt_hdr->frame_len -= len; -<<<<<<< HEAD pkt_hdr->unshared_len -= len; pkt_hdr->buf_hdr.seg[last].len -= len; } @@ -337,9 +315,6 @@ static inline uint32_t packet_len(odp_packet_hdr_t *pkt_hdr) static inline uint32_t packet_ref_count(odp_packet_hdr_t *pkt_hdr) { return odp_atomic_load_u32(&pkt_hdr->ref_count); -======= - pkt_hdr->buf_hdr.seg[last].len -= len; ->>>>>>> v1.13.0.0 } static inline void packet_ref_count_set(odp_packet_hdr_t *pkt_hdr, uint32_t n) From patchwork Fri Jan 27 14:29:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92658 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230671obz; Fri, 27 Jan 2017 06:34:47 -0800 (PST) X-Received: by 10.55.43.158 with SMTP id r30mr9352756qkr.28.1485527687083; Fri, 27 Jan 2017 06:34:47 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b14si1441766qkc.252.2017.01.27.06.34.46; Fri, 27 Jan 2017 06:34:47 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B20CF62DE5; Fri, 27 Jan 2017 14:34:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 154F160A27; Fri, 27 Jan 2017 14:30:49 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8EF9660E18; Fri, 27 Jan 2017 14:30:45 +0000 (UTC) Received: from mail-lf0-f43.google.com (mail-lf0-f43.google.com [209.85.215.43]) by lists.linaro.org (Postfix) with ESMTPS id EB335609EF for ; Fri, 27 Jan 2017 14:29:53 +0000 (UTC) Received: by mail-lf0-f43.google.com with SMTP id x1so76116807lff.0 for ; Fri, 27 Jan 2017 06:29:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nzAwqbGVmIj929+/InHiJfN7llAKo/MV8KHT7s6BnCw=; b=GhpPRaVt/xxQHUElbbPYVoo3qUVpu7V0wyB4VdC+tfDKBWW0yodjBeF7oDYwCgSRTK WQxAY8ZP/awjvWuOG+lh7xlFU+C8nQDF2FzLwkaRei3beA58mzJ6mKHDqQ7exSiBMXEe VstX/jXO+DfnUQcZQpb1AHKQT/KjgD46tRMcyKu9+tSP3ZFmwXsIyRsUmQk/Vg2IhVyS RD80ztuKPlX5swRNj/qg3r4E+ml8ZW0k/CnfdwlMgSfkzV5S8x0wnGM9HnuuJj8e3XRr EL+cOm0vzYMBGWmKuhNxsijtksu9IHamnbEWGDFI7Jey7mDpkrucpFOsJANvYKlODqE0 J7Gw== X-Gm-Message-State: AIkVDXINWruTL5wULS2THpaNjEOuWCuY/NKwIHGWndXeS+oFt5loW65e+mTGlCEKli6A1+hv9Rs= X-Received: by 10.46.69.7 with SMTP id s7mr3291034lja.44.1485527392390; Fri, 27 Jan 2017 06:29:52 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:51 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:13 +0300 Message-Id: <20170127142921.29029-8-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 07/15] merge fix: odp_init.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_init.c | 12 ------------ 1 file changed, 12 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 94e06319..2cd8fe3f 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -10,11 +10,8 @@ #include #include #include -<<<<<<< HEAD #include #include -======= ->>>>>>> v1.13.0.0 #include #include #include @@ -25,7 +22,6 @@ #define _ODP_FILES_FMT "odp-%d-" #define _ODP_TMPDIR "/tmp" -<<<<<<< HEAD /* the name of the ODP configuration file: */ #define CONFIGURATION_FILE_ENV_NONE "none" @@ -35,8 +31,6 @@ /* the ODP configuration file name can also be oveerwritten by env. variable: */ #define ODP_SYSCONFIG_FILE_ENV "ODP_SYSCONFIG_FILE" -======= ->>>>>>> v1.13.0.0 struct odp_global_data_s odp_global_data; @@ -82,7 +76,6 @@ static int cleanup_files(const char *dirpath, int odp_pid) return 0; } -<<<<<<< HEAD /* read the odp configuration file * * the configuration file is read from: @@ -149,8 +142,6 @@ static int read_configfile(void) return 0; } -======= ->>>>>>> v1.13.0.0 int odp_init_global(odp_instance_t *instance, const odp_init_t *params, const odp_platform_init_t *platform_params ODP_UNUSED) @@ -173,12 +164,9 @@ int odp_init_global(odp_instance_t *instance, cleanup_files(_ODP_TMPDIR, odp_global_data.main_pid); -<<<<<<< HEAD if (read_configfile()) goto init_failed; -======= ->>>>>>> v1.13.0.0 if (odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; From patchwork Fri Jan 27 14:29:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92660 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp231067obz; Fri, 27 Jan 2017 06:35:43 -0800 (PST) X-Received: by 10.200.53.150 with SMTP id k22mr8341326qtb.19.1485527743461; Fri, 27 Jan 2017 06:35:43 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e184si3653784qkc.72.2017.01.27.06.35.43; Fri, 27 Jan 2017 06:35:43 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1886360838; Fri, 27 Jan 2017 14:35:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id F3E9262E05; Fri, 27 Jan 2017 14:30:57 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2E6A360E18; Fri, 27 Jan 2017 14:30:49 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id 53628609AC for ; Fri, 27 Jan 2017 14:29:55 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id z134so162792203lff.3 for ; Fri, 27 Jan 2017 06:29:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SmHcSRi6tGMUHUzpMu7/Eq/gr8xUWwkKGFv8NvJkCu4=; b=T2+eE9ZaHydEJQZ3LTRZ2LzIQvkK5M9R1xQZ0+e75genSPSSuSZF3V+hkuSH++FqMe Y3hwyRZU5t7eteA7gS/mzIE2dmptkbkXeK7qlIcevothVmr1kpJheTtuR2Bwh32opy87 fIQBsUfbEcE84t0VsXShKHVquASRbyNRlid477/YYe0CiJCesYYPGynYok7LTHci1k74 RF9V1wCt4k/zbsCHceqeQC8pNyDTIOQhcVkboiYx+oA9GMT3TvDonBubn6P+44jYqqvI nFdTUzgjhfEAI86QeQyqZjJPPNLbe8Lw+I6N5tfwLxsoQg01u0NS0miQJ9at02Bey4EI Nzkg== X-Gm-Message-State: AIkVDXI2ExlvyG7M8fcKeW47IUxt8+n800uaXf2DC5GLrYnOwm3OzecMcMUnJFQbnH4gFsVDtug= X-Received: by 10.46.83.93 with SMTP id t29mr3266219ljd.20.1485527393501; Fri, 27 Jan 2017 06:29:53 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:52 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:14 +0300 Message-Id: <20170127142921.29029-9-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 08/15] merge fix: odp_packet.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" --- platform/linux-generic/odp_packet.c | 513 ------------------------------------ 1 file changed, 513 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 12981495..170965ac 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -33,7 +33,6 @@ static inline odp_buffer_t buffer_handle(odp_packet_hdr_t *pkt_hdr) return pkt_hdr->buf_hdr.handle.handle; } -<<<<<<< HEAD static inline uint32_t packet_ref_inc(odp_packet_hdr_t *pkt_hdr) { return odp_atomic_fetch_inc_u32(&pkt_hdr->ref_count); @@ -44,20 +43,14 @@ static inline uint32_t packet_ref_dec(odp_packet_hdr_t *pkt_hdr) return odp_atomic_fetch_dec_u32(&pkt_hdr->ref_count); } -======= ->>>>>>> v1.13.0.0 static inline uint32_t packet_seg_len(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) { return pkt_hdr->buf_hdr.seg[seg_idx].len; } -<<<<<<< HEAD static inline uint8_t *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) -======= -static inline void *packet_seg_data(odp_packet_hdr_t *pkt_hdr, uint32_t seg_idx) ->>>>>>> v1.13.0.0 { return pkt_hdr->buf_hdr.seg[seg_idx].data; } @@ -70,14 +63,11 @@ static inline int packet_last_seg(odp_packet_hdr_t *pkt_hdr) return pkt_hdr->buf_hdr.segcount - 1; } -<<<<<<< HEAD static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) { return pkt_hdr->buf_hdr.seg[0].data; } -======= ->>>>>>> v1.13.0.0 static inline uint32_t packet_first_seg_len(odp_packet_hdr_t *pkt_hdr) { return packet_seg_len(pkt_hdr, 0); @@ -90,14 +80,6 @@ static inline uint32_t packet_last_seg_len(odp_packet_hdr_t *pkt_hdr) return packet_seg_len(pkt_hdr, last); } -<<<<<<< HEAD -======= -static inline void *packet_data(odp_packet_hdr_t *pkt_hdr) -{ - return pkt_hdr->buf_hdr.seg[0].data; -} - ->>>>>>> v1.13.0.0 static inline void *packet_tail(odp_packet_hdr_t *pkt_hdr) { int last = packet_last_seg(pkt_hdr); @@ -128,10 +110,7 @@ static inline void push_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom -= len; pkt_hdr->frame_len += len; -<<<<<<< HEAD pkt_hdr->unshared_len += len; -======= ->>>>>>> v1.13.0.0 pkt_hdr->buf_hdr.seg[0].data -= len; pkt_hdr->buf_hdr.seg[0].len += len; } @@ -140,10 +119,7 @@ static inline void pull_head(odp_packet_hdr_t *pkt_hdr, uint32_t len) { pkt_hdr->headroom += len; pkt_hdr->frame_len -= len; -<<<<<<< HEAD pkt_hdr->unshared_len -= len; -======= ->>>>>>> v1.13.0.0 pkt_hdr->buf_hdr.seg[0].data += len; pkt_hdr->buf_hdr.seg[0].len -= len; } @@ -154,10 +130,7 @@ static inline void push_tail(odp_packet_hdr_t *pkt_hdr, uint32_t len) pkt_hdr->tailroom -= len; pkt_hdr->frame_len += len; -<<<<<<< HEAD pkt_hdr->unshared_len += len; -======= ->>>>>>> v1.13.0.0 pkt_hdr->buf_hdr.seg[last].len += len; } @@ -185,13 +158,10 @@ static inline void packet_seg_copy_md(odp_packet_hdr_t *dst, dst->buf_hdr.uarea_addr = src->buf_hdr.uarea_addr; dst->buf_hdr.uarea_size = src->buf_hdr.uarea_size; -<<<<<<< HEAD /* reference related metadata */ dst->ref_len = src->ref_len; dst->unshared_len = src->unshared_len; -======= ->>>>>>> v1.13.0.0 /* segmentation data is not copied: * buf_hdr.seg[] * buf_hdr.segcount @@ -206,7 +176,6 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, int seg = 0; int seg_count = pkt_hdr->buf_hdr.segcount; -<<<<<<< HEAD /* Special processing for references */ while (offset >= pkt_hdr->frame_len && pkt_hdr->ref_hdr) { offset -= (pkt_hdr->frame_len - pkt_hdr->ref_offset); @@ -216,9 +185,6 @@ static inline void *packet_map(odp_packet_hdr_t *pkt_hdr, } if (odp_unlikely(offset > pkt_hdr->frame_len)) -======= - if (odp_unlikely(offset >= pkt_hdr->frame_len)) ->>>>>>> v1.13.0.0 return NULL; if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || seg_count == 1)) { @@ -331,7 +297,6 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.seg[0].data = hdr->buf_hdr.base_data; hdr->buf_hdr.seg[0].len = BASE_LEN; -<<<<<<< HEAD packet_ref_count_set(hdr, 1); /* Link segments */ @@ -358,32 +323,6 @@ static inline int num_segments(uint32_t len) uint32_t max_seg_len; int num; -======= - - /* Link segments */ - if (CONFIG_PACKET_MAX_SEGS != 1) { - hdr->buf_hdr.segcount = num; - - if (odp_unlikely(num > 1)) { - for (i = 1; i < num; i++) { - odp_buffer_hdr_t *buf_hdr; - - buf_hdr = &pkt_hdr[i]->buf_hdr; - hdr->buf_hdr.seg[i].hdr = buf_hdr; - hdr->buf_hdr.seg[i].data = buf_hdr->base_data; - hdr->buf_hdr.seg[i].len = BASE_LEN; - } - } - } -} - -/* Calculate the number of segments */ -static inline int num_segments(uint32_t len) -{ - uint32_t max_seg_len; - int num; - ->>>>>>> v1.13.0.0 if (CONFIG_PACKET_MAX_SEGS == 1) return 1; @@ -414,7 +353,6 @@ static inline void add_all_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from) to->buf_hdr.segcount = n + num; } -<<<<<<< HEAD static inline void copy_num_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from, int first, int num) @@ -425,180 +363,6 @@ static inline void copy_num_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from, to->buf_hdr.seg[i].hdr = from->buf_hdr.seg[first + i].hdr; to->buf_hdr.seg[i].data = from->buf_hdr.seg[first + i].data; to->buf_hdr.seg[i].len = from->buf_hdr.seg[first + i].len; -======= - -static inline void copy_num_segs(odp_packet_hdr_t *to, odp_packet_hdr_t *from, - int first, int num) -{ - int i; - - for (i = 0; i < num; i++) { - to->buf_hdr.seg[i].hdr = from->buf_hdr.seg[first + i].hdr; - to->buf_hdr.seg[i].data = from->buf_hdr.seg[first + i].data; - to->buf_hdr.seg[i].len = from->buf_hdr.seg[first + i].len; - } - - to->buf_hdr.segcount = num; -} - -static inline odp_packet_hdr_t *alloc_segments(pool_t *pool, int num) -{ - odp_buffer_t buf[num]; - odp_packet_hdr_t *pkt_hdr[num]; - int ret; - - ret = buffer_alloc_multi(pool, buf, (odp_buffer_hdr_t **)pkt_hdr, num); - if (odp_unlikely(ret != num)) { - if (ret > 0) - buffer_free_multi(buf, ret); - - return NULL; - } - - init_segments(pkt_hdr, num); - - return pkt_hdr[0]; -} - -static inline odp_packet_hdr_t *add_segments(odp_packet_hdr_t *pkt_hdr, - pool_t *pool, uint32_t len, - int num, int head) -{ - odp_packet_hdr_t *new_hdr; - uint32_t seg_len, offset; - - new_hdr = alloc_segments(pool, num); - - if (new_hdr == NULL) - return NULL; - - seg_len = len - ((num - 1) * pool->max_seg_len); - offset = pool->max_seg_len - seg_len; - - if (head) { - /* add into the head*/ - add_all_segs(new_hdr, pkt_hdr); - - /* adjust first segment length */ - new_hdr->buf_hdr.seg[0].data += offset; - new_hdr->buf_hdr.seg[0].len = seg_len; - - packet_seg_copy_md(new_hdr, pkt_hdr); - new_hdr->frame_len = pkt_hdr->frame_len + len; - new_hdr->headroom = pool->headroom + offset; - new_hdr->tailroom = pkt_hdr->tailroom; - - pkt_hdr = new_hdr; - } else { - int last; - - /* add into the tail */ - add_all_segs(pkt_hdr, new_hdr); - - /* adjust last segment length */ - last = packet_last_seg(pkt_hdr); - pkt_hdr->buf_hdr.seg[last].len = seg_len; - - pkt_hdr->frame_len += len; - pkt_hdr->tailroom = pool->tailroom + offset; - } - - return pkt_hdr; -} - -static inline void free_bufs(odp_packet_hdr_t *pkt_hdr, int first, int num) -{ - int i; - odp_buffer_t buf[num]; - - for (i = 0; i < num; i++) - buf[i] = buffer_handle(pkt_hdr->buf_hdr.seg[first + i].hdr); - - buffer_free_multi(buf, num); -} - -static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, - int num, uint32_t free_len, - uint32_t pull_len, int head) -{ - int num_remain = pkt_hdr->buf_hdr.segcount - num; - - if (head) { - odp_packet_hdr_t *new_hdr; - int i; - odp_buffer_t buf[num]; - - for (i = 0; i < num; i++) - buf[i] = buffer_handle(pkt_hdr->buf_hdr.seg[i].hdr); - - /* First remaining segment is the new packet descriptor */ - new_hdr = pkt_hdr->buf_hdr.seg[num].hdr; - - copy_num_segs(new_hdr, pkt_hdr, num, num_remain); - packet_seg_copy_md(new_hdr, pkt_hdr); - - /* Tailroom not changed */ - new_hdr->tailroom = pkt_hdr->tailroom; - new_hdr->headroom = seg_headroom(new_hdr, 0); - new_hdr->frame_len = pkt_hdr->frame_len - free_len; - - pull_head(new_hdr, pull_len); - - pkt_hdr = new_hdr; - - buffer_free_multi(buf, num); - } else { - /* Free last 'num' bufs */ - free_bufs(pkt_hdr, num_remain, num); - - /* Head segment remains, no need to copy or update majority - * of the metadata. */ - pkt_hdr->buf_hdr.segcount = num_remain; - pkt_hdr->frame_len -= free_len; - pkt_hdr->tailroom = seg_tailroom(pkt_hdr, num_remain - 1); - - pull_tail(pkt_hdr, pull_len); - } - - return pkt_hdr; -} - -static inline int packet_alloc(pool_t *pool, uint32_t len, int max_pkt, - int num_seg, odp_packet_t *pkt, int parse) -{ - int num_buf, i; - int num = max_pkt; - int max_buf = max_pkt * num_seg; - odp_buffer_t buf[max_buf]; - odp_packet_hdr_t *pkt_hdr[max_buf]; - - num_buf = buffer_alloc_multi(pool, buf, (odp_buffer_hdr_t **)pkt_hdr, - max_buf); - - /* Failed to allocate all segments */ - if (odp_unlikely(num_buf != max_buf)) { - int num_free; - - num = num_buf / num_seg; - num_free = num_buf - (num * num_seg); - - if (num_free > 0) - buffer_free_multi(&buf[num_buf - num_free], num_free); - - if (num == 0) - return 0; - } - - for (i = 0; i < num; i++) { - odp_packet_hdr_t *hdr; - - /* First buffer is the packet descriptor */ - pkt[i] = (odp_packet_t)buf[i * num_seg]; - hdr = pkt_hdr[i * num_seg]; - init_segments(&pkt_hdr[i * num_seg], num_seg); - - packet_init(hdr, len, parse); ->>>>>>> v1.13.0.0 } to->buf_hdr.segcount = num; @@ -792,18 +556,6 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, return num; } -int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, - odp_packet_t pkt[], int max_num) -{ - pool_t *pool = pool_entry_from_hdl(pool_hdl); - int num, num_seg; - - num_seg = num_segments(len); - num = packet_alloc(pool, len, max_num, num_seg, pkt, 1); - - return num; -} - odp_packet_t odp_packet_alloc(odp_pool_t pool_hdl, uint32_t len) { pool_t *pool = pool_entry_from_hdl(pool_hdl); @@ -840,7 +592,6 @@ int odp_packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, if (odp_unlikely(len > pool->max_len)) return -1; -<<<<<<< HEAD num_seg = num_segments(len); num = packet_alloc(pool, len, max_num, num_seg, pkt, 0); @@ -863,65 +614,19 @@ static inline void packet_free(odp_packet_hdr_t *pkt_hdr) pkt_hdr = ref_hdr; } while (pkt_hdr); -======= - - num_seg = num_segments(len); - num = packet_alloc(pool, len, max_num, num_seg, pkt, 0); - - return num; ->>>>>>> v1.13.0.0 } void odp_packet_free(odp_packet_t pkt) { -<<<<<<< HEAD packet_free(odp_packet_hdr(pkt)); -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - int num_seg = pkt_hdr->buf_hdr.segcount; - - if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) - buffer_free_multi((odp_buffer_t *)&pkt, 1); - else - free_bufs(pkt_hdr, 0, num_seg); ->>>>>>> v1.13.0.0 } void odp_packet_free_multi(const odp_packet_t pkt[], int num) { -<<<<<<< HEAD int i; for (i = 0; i < num; i++) packet_free(odp_packet_hdr(pkt[i])); -======= - if (CONFIG_PACKET_MAX_SEGS == 1) { - buffer_free_multi((const odp_buffer_t * const)pkt, num); - } else { - odp_buffer_t buf[num * CONFIG_PACKET_MAX_SEGS]; - int i, j; - int bufs = 0; - - for (i = 0; i < num; i++) { - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt[i]); - int num_seg = pkt_hdr->buf_hdr.segcount; - odp_buffer_hdr_t *buf_hdr = &pkt_hdr->buf_hdr; - - buf[bufs] = (odp_buffer_t)pkt[i]; - bufs++; - - if (odp_likely(num_seg == 1)) - continue; - - for (j = 1; j < num_seg; j++) { - buf[bufs] = buffer_handle(buf_hdr->seg[j].hdr); - bufs++; - } - } - - buffer_free_multi(buf, bufs); - } ->>>>>>> v1.13.0.0 } int odp_packet_reset(odp_packet_t pkt, uint32_t len) @@ -932,12 +637,9 @@ int odp_packet_reset(odp_packet_t pkt, uint32_t len) if (len > pool->headroom + pool->data_size + pool->tailroom) return -1; -<<<<<<< HEAD if (pkt_hdr->ref_hdr) packet_free(pkt_hdr->ref_hdr); -======= ->>>>>>> v1.13.0.0 packet_init(pkt_hdr, len, 0); return 0; @@ -994,11 +696,7 @@ void *odp_packet_data(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); -<<<<<<< HEAD return packet_map(pkt_hdr, 0, NULL, NULL); -======= - return packet_data(pkt_hdr); ->>>>>>> v1.13.0.0 } uint32_t odp_packet_seg_len(odp_packet_t pkt) @@ -1244,11 +942,7 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); uint32_t frame_len = pkt_hdr->frame_len; -<<<<<<< HEAD uint32_t headroom = pkt_hdr->headroom; -======= - uint32_t headroom = pkt_hdr->headroom; ->>>>>>> v1.13.0.0 int ret = 0; if (len > headroom) { @@ -1258,7 +952,6 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; -<<<<<<< HEAD num = num_segments(len - headroom); segs = pkt_hdr->buf_hdr.segcount; @@ -1391,94 +1084,6 @@ int odp_packet_extend_head(odp_packet_t *pkt, uint32_t len, if (seg_len) *seg_len = seg_ln; } -======= - - num = num_segments(len - headroom); - segs = pkt_hdr->buf_hdr.segcount; - - if (odp_unlikely((segs + num) > CONFIG_PACKET_MAX_SEGS)) { - /* Cannot directly add new segments */ - odp_packet_hdr_t *new_hdr; - int new_segs = 0; - int free_segs = 0; - uint32_t offset; - - num = num_segments(frame_len + len); - - if (num > segs) { - /* Allocate additional segments */ - new_segs = num - segs; - new_hdr = alloc_segments(pool, new_segs); - - if (new_hdr == NULL) - return -1; - - } else if (num < segs) { - free_segs = segs - num; - } - - /* Pack all data to packet tail */ - move_data_to_tail(pkt_hdr, segs); - reset_seg(pkt_hdr, 0, segs); - - if (new_segs) { - add_all_segs(new_hdr, pkt_hdr); - packet_seg_copy_md(new_hdr, pkt_hdr); - segs += new_segs; - - pkt_hdr = new_hdr; - *pkt = packet_handle(pkt_hdr); - } else if (free_segs) { - new_hdr = pkt_hdr->buf_hdr.seg[free_segs].hdr; - packet_seg_copy_md(new_hdr, pkt_hdr); - - /* Free extra segs */ - free_bufs(pkt_hdr, 0, free_segs); - - segs -= free_segs; - pkt_hdr = new_hdr; - *pkt = packet_handle(pkt_hdr); - } - - frame_len += len; - offset = (segs * BASE_LEN) - frame_len; - - pkt_hdr->buf_hdr.seg[0].data += offset; - pkt_hdr->buf_hdr.seg[0].len -= offset; - - pkt_hdr->buf_hdr.segcount = segs; - pkt_hdr->frame_len = frame_len; - pkt_hdr->headroom = offset + pool->headroom; - pkt_hdr->tailroom = pool->tailroom; - - /* Data was moved */ - ret = 1; - } else { - void *ptr; - - push_head(pkt_hdr, headroom); - ptr = add_segments(pkt_hdr, pool, len - headroom, - num, 1); - - if (ptr == NULL) { - /* segment alloc failed, rollback changes */ - pull_head(pkt_hdr, headroom); - return -1; - } - - *pkt = packet_handle(ptr); - pkt_hdr = ptr; - } - } else { - push_head(pkt_hdr, len); - } - - if (data_ptr) - *data_ptr = packet_data(pkt_hdr); - - if (seg_len) - *seg_len = packet_first_seg_len(pkt_hdr); ->>>>>>> v1.13.0.0 return ret; } @@ -1499,19 +1104,13 @@ void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len_out) { -<<<<<<< HEAD odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt), *nxt_hdr; uint32_t seg_len = packet_first_seg_len(pkt_hdr); int ret = 0; -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); - uint32_t seg_len = packet_first_seg_len(pkt_hdr); ->>>>>>> v1.13.0.0 if (len > packet_len(pkt_hdr)) return -1; -<<<<<<< HEAD ODP_ASSERT(len <= odp_packet_unshared_len(*pkt)); /* Special processing for references */ @@ -1559,51 +1158,18 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, } return ret; -======= - if (len < seg_len) { - pull_head(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { - int num = 0; - uint32_t pull_len = 0; - - while (seg_len <= len) { - pull_len = len - seg_len; - num++; - seg_len += packet_seg_len(pkt_hdr, num); - } - - pkt_hdr = free_segments(pkt_hdr, num, len - pull_len, - pull_len, 1); - *pkt = packet_handle(pkt_hdr); - } - - if (data_ptr) - *data_ptr = packet_data(pkt_hdr); - - if (seg_len_out) - *seg_len_out = packet_first_seg_len(pkt_hdr); - - return 0; ->>>>>>> v1.13.0.0 } void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) { -<<<<<<< HEAD odp_packet_hdr_t *pkt_hdr = odp_packet_last_hdr(pkt, NULL); -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); ->>>>>>> v1.13.0.0 void *old_tail; if (len > pkt_hdr->tailroom) return NULL; -<<<<<<< HEAD ODP_ASSERT(packet_ref_count(pkt_hdr) == 1); -======= ->>>>>>> v1.13.0.0 old_tail = packet_tail(pkt_hdr); push_tail(pkt_hdr, len); @@ -1613,17 +1179,12 @@ void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, void **data_ptr, uint32_t *seg_len_out) { -<<<<<<< HEAD odp_packet_hdr_t *pkt_hdr = odp_packet_last_hdr(*pkt, NULL); -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); ->>>>>>> v1.13.0.0 uint32_t frame_len = pkt_hdr->frame_len; uint32_t tailroom = pkt_hdr->tailroom; uint32_t tail_off = frame_len; int ret = 0; -<<<<<<< HEAD ODP_ASSERT(packet_ref_count(pkt_hdr) == 1); if (len > tailroom) { @@ -1631,13 +1192,6 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, int num; int segs; -======= - if (len > tailroom) { - pool_t *pool = pool_entry_from_hdl(pkt_hdr->buf_hdr.pool_hdl); - int num; - int segs; - ->>>>>>> v1.13.0.0 if (odp_unlikely((frame_len + len) > pool->max_len)) return -1; @@ -1734,18 +1288,13 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, { int last; uint32_t seg_len; -<<<<<<< HEAD uint32_t offset; odp_packet_hdr_t *first_hdr = odp_packet_hdr(*pkt); odp_packet_hdr_t *pkt_hdr, *prev_hdr; -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(*pkt); ->>>>>>> v1.13.0.0 if (len > packet_len(first_hdr)) return -1; -<<<<<<< HEAD pkt_hdr = odp_packet_last_hdr(*pkt, &offset); /* Special processing for references */ @@ -1767,14 +1316,6 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, pkt_hdr->buf_hdr.segcount == 1) { pull_tail(pkt_hdr, len); } else { -======= - last = packet_last_seg(pkt_hdr); - seg_len = packet_seg_len(pkt_hdr, last); - - if (len < seg_len) { - pull_tail(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { ->>>>>>> v1.13.0.0 int num = 0; uint32_t pull_len = 0; @@ -1989,7 +1530,6 @@ int odp_packet_is_segmented(odp_packet_t pkt) int odp_packet_num_segs(odp_packet_t pkt) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); -<<<<<<< HEAD uint32_t segcount = 0, i; uint32_t seg_offset = 0, offset; @@ -2009,42 +1549,23 @@ int odp_packet_num_segs(odp_packet_t pkt) } while (pkt_hdr); return segcount; -======= - - return pkt_hdr->buf_hdr.segcount; ->>>>>>> v1.13.0.0 } odp_packet_seg_t odp_packet_first_seg(odp_packet_t pkt ODP_UNUSED) { -<<<<<<< HEAD -======= - (void)pkt; - ->>>>>>> v1.13.0.0 return 0; } odp_packet_seg_t odp_packet_last_seg(odp_packet_t pkt) { -<<<<<<< HEAD return (odp_packet_seg_t)(odp_packet_num_segs(pkt) - 1); -======= - odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); - - return packet_last_seg(pkt_hdr); ->>>>>>> v1.13.0.0 } odp_packet_seg_t odp_packet_next_seg(odp_packet_t pkt, odp_packet_seg_t seg) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); -<<<<<<< HEAD if (odp_unlikely(seg >= packet_last_seg(pkt_hdr))) -======= - if (odp_unlikely(seg >= (odp_packet_seg_t)packet_last_seg(pkt_hdr))) ->>>>>>> v1.13.0.0 return ODP_PACKET_SEG_INVALID; return seg + 1; @@ -2079,20 +1600,12 @@ void *odp_packet_seg_data(odp_packet_t pkt, odp_packet_seg_t seg) if (odp_unlikely(seg + seg_offset >= pkt_hdr->buf_hdr.segcount)) return NULL; -<<<<<<< HEAD return packet_seg_data(pkt_hdr, seg + seg_offset) + offset; -======= - if (odp_unlikely(seg >= pkt_hdr->buf_hdr.segcount)) - return NULL; - - return packet_seg_data(pkt_hdr, seg); ->>>>>>> v1.13.0.0 } uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) { odp_packet_hdr_t *pkt_hdr = odp_packet_hdr(pkt); -<<<<<<< HEAD uint32_t seg_offset = 0, offset = 0, i; while (seg >= pkt_hdr->buf_hdr.segcount - seg_offset && @@ -2113,13 +1626,6 @@ uint32_t odp_packet_seg_data_len(odp_packet_t pkt, odp_packet_seg_t seg) return 0; return packet_seg_len(pkt_hdr, seg + seg_offset) - offset; -======= - - if (odp_unlikely(seg >= pkt_hdr->buf_hdr.segcount)) - return 0; - - return packet_seg_len(pkt_hdr, seg); ->>>>>>> v1.13.0.0 } /* @@ -2244,7 +1750,6 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) uint32_t dst_len = dst_hdr->frame_len; uint32_t src_len = src_hdr->frame_len; -<<<<<<< HEAD ODP_ASSERT(packet_ref_count(dst_hdr) == 1); /* Do a copy if resulting packet would be out of segments or packets @@ -2252,12 +1757,6 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) if (odp_unlikely((dst_segs + src_segs) > CONFIG_PACKET_MAX_SEGS) || odp_unlikely(dst_pool != src_pool) || odp_unlikely(packet_ref_count(src_hdr)) > 1) { -======= - /* Do a copy if resulting packet would be out of segments or packets - * are from different pools. */ - if (odp_unlikely((dst_segs + src_segs) > CONFIG_PACKET_MAX_SEGS) || - odp_unlikely(dst_pool != src_pool)) { ->>>>>>> v1.13.0.0 if (odp_packet_extend_tail(dst, src_len, NULL, NULL) >= 0) { (void)odp_packet_copy_from_pkt(*dst, dst_len, src, 0, src_len); @@ -2272,14 +1771,9 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) add_all_segs(dst_hdr, src_hdr); -<<<<<<< HEAD dst_hdr->frame_len = dst_len + src_len; dst_hdr->unshared_len = dst_len + src_len; dst_hdr->tailroom = src_hdr->tailroom; -======= - dst_hdr->frame_len = dst_len + src_len; - dst_hdr->tailroom = src_hdr->tailroom; ->>>>>>> v1.13.0.0 /* Data was not moved in memory */ return 0; @@ -2628,17 +2122,10 @@ int odp_packet_is_valid(odp_packet_t pkt) { if (odp_buffer_is_valid((odp_buffer_t)pkt) == 0) return 0; -<<<<<<< HEAD if (odp_event_type(odp_packet_to_event(pkt)) != ODP_EVENT_PACKET) return 0; -======= - - if (odp_event_type(odp_packet_to_event(pkt)) != ODP_EVENT_PACKET) - return 0; - ->>>>>>> v1.13.0.0 return 1; } From patchwork Fri Jan 27 14:29:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92659 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp230831obz; Fri, 27 Jan 2017 06:35:12 -0800 (PST) X-Received: by 10.200.52.129 with SMTP id w1mr7648031qtb.43.1485527712263; Fri, 27 Jan 2017 06:35:12 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d192si3634699qka.304.2017.01.27.06.35.11; Fri, 27 Jan 2017 06:35:12 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id ABF9460806; Fri, 27 Jan 2017 14:35:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7F8C260E18; Fri, 27 Jan 2017 14:30:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 525D760E18; Fri, 27 Jan 2017 14:30:46 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 0A4BC609F2 for ; Fri, 27 Jan 2017 14:29:56 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id z134so162792367lff.3 for ; Fri, 27 Jan 2017 06:29:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8OTDQBpjnUhNWDGZFx29MwiCnR+B7e8uOUhHs/sH2uU=; b=ldpurhecoXP68AvzUEkOu0Zuj1Wnc6dRGqwKm98AnbIZcOw82z0N9Xi3xzM2mpvp+I hW2qxViR0bue9Kb0IuwoXaSSIM7MK5+jkNQ84ULoFlaxKySqiEC9rRIiG/+1uejNchoI 9lof1aS/qElpJwqj/6fBWXcChB9CPJoWVn+IM/QxgpOtE5WPCEsdOT9a3/VQsCzcqxyE Dyt8GsoTJOX8/307sOvy5rQ7Kn7Pvig6djVnWRw7RTvKFujcOXveNkbll7pmzfti39jt 5fVlKNdZ/puGM+zhaKKyTKFzm/7mo72nnhs9AinaIkWmCV7I0U6oO2V4wUcKK9bz5l+Z XuCw== X-Gm-Message-State: AIkVDXLFyoIDtqVX8bdLBjhrC32w4U+n/dxh7kw/zAyMXaZl65Gx/tgKdvBOzJBMAQUnw8CdpkM= X-Received: by 10.25.22.96 with SMTP id m93mr2992834lfi.101.1485527394491; Fri, 27 Jan 2017 06:29:54 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:53 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:15 +0300 Message-Id: <20170127142921.29029-10-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 09/15] merge fix: odp_queue.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_queue.c | 3 --- 1 file changed, 3 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index 37fa99d5..66086959 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -570,11 +570,8 @@ static inline int deq_multi(queue_entry_t *queue, odp_buffer_hdr_t *buf_hdr[], if (queue->s.type == ODP_QUEUE_TYPE_SCHED) sched_fn->save_context(queue); -<<<<<<< HEAD UNLOCK(&queue->s.lock); -======= ->>>>>>> v1.13.0.0 return i; } From patchwork Fri Jan 27 14:29:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92661 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp231814obz; Fri, 27 Jan 2017 06:37:33 -0800 (PST) X-Received: by 10.200.48.65 with SMTP id g1mr7905225qte.94.1485527853472; Fri, 27 Jan 2017 06:37:33 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p132si3648047qka.200.2017.01.27.06.37.28; Fri, 27 Jan 2017 06:37:33 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 37A9B60E18; Fri, 27 Jan 2017 14:37:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C92E760D2C; Fri, 27 Jan 2017 14:31:20 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8C02262E0B; Fri, 27 Jan 2017 14:31:16 +0000 (UTC) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by lists.linaro.org (Postfix) with ESMTPS id E03C660D6B for ; Fri, 27 Jan 2017 14:29:57 +0000 (UTC) Received: by mail-lf0-f49.google.com with SMTP id v186so162827305lfa.1 for ; Fri, 27 Jan 2017 06:29:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HPXi1jx2n54F4M2axvMegLHMhW3cWTS/oF0vxePq4eo=; b=OWKrUHi/AQHfZcvK92vSdoQIz8drNC2Dl14nTySMe9Gdwvn1L2V0IUBXKAkoPyqIHT MCSmyJDTVn1FB1HWBN2STNBHyyF0z8xEW+KGOkihF7bxvP4RxjmaljGLaylFn2lJoUOj GCJ22A/vbVbjHQlasEWEuZx2c+jjZclblGFR6gHcNKhse3rJqh1WOD/sHwZ9LbNNK6xT 05AYZiq/pNccsgZLKukTBZEQy9aBpteyiYT+jEH4tOUpH+R6xUM3iHaTcBjsh4F3ewQ7 3loSrvUOovnWKOhrOS92rjWgbXhuQArt6De/FldvBkE8dKWFqfLefEttROjA93ZWU+Hq JBHQ== X-Gm-Message-State: AIkVDXJ4y6wHnNGGySkXYlgd/fU56n60LpP3teLHTLW5ja9TA1ogytHPHPsAKnRCDjDqHU/qFRc= X-Received: by 10.25.56.25 with SMTP id f25mr3025251lfa.83.1485527396454; Fri, 27 Jan 2017 06:29:56 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:55 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:17 +0300 Message-Id: <20170127142921.29029-12-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 11/15] merge fix: odp_schedule_sp.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_schedule_sp.c | 36 -------------------------------- 1 file changed, 36 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c index 56088bd8..1bc33eb2 100644 --- a/platform/linux-generic/odp_schedule_sp.c +++ b/platform/linux-generic/odp_schedule_sp.c @@ -364,7 +364,6 @@ static inline sched_cmd_t *rem_head(int group, int prio) prio_queue_t *prio_queue; uint32_t ring_idx, index; int pktio; -<<<<<<< HEAD prio_queue = &sched_global.prio_queue[group][prio]; @@ -373,16 +372,6 @@ static inline sched_cmd_t *rem_head(int group, int prio) if (ring_idx == RING_EMPTY) return NULL; -======= - - prio_queue = &sched_global.prio_queue[group][prio]; - - ring_idx = ring_deq(&prio_queue->ring, RING_MASK); - - if (ring_idx == RING_EMPTY) - return NULL; - ->>>>>>> v1.13.0.0 pktio = index_from_ring_idx(&index, ring_idx); if (pktio) @@ -451,7 +440,6 @@ static inline sched_cmd_t *sched_cmd(void) /* There's no matching store_rel since the value is updated while * holding a lock */ gen_cnt = odp_atomic_load_acq_u32(&thr_group->gen_cnt); -<<<<<<< HEAD /* Check if groups have changed and need to be read again */ if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) { @@ -467,23 +455,6 @@ static inline sched_cmd_t *sched_cmd(void) odp_ticketlock_unlock(&sched_group->s.lock); -======= - - /* Check if groups have changed and need to be read again */ - if (odp_unlikely(gen_cnt != sched_local.gen_cnt)) { - int num_grp; - - odp_ticketlock_lock(&sched_group->s.lock); - - num_grp = thr_group->num_group; - gen_cnt = odp_atomic_load_u32(&thr_group->gen_cnt); - - for (i = 0; i < num_grp; i++) - sched_local.group[i] = thr_group->group[i]; - - odp_ticketlock_unlock(&sched_group->s.lock); - ->>>>>>> v1.13.0.0 sched_local.num_group = num_grp; sched_local.gen_cnt = gen_cnt; } @@ -837,13 +808,10 @@ static void order_unlock(void) { } -<<<<<<< HEAD static void save_context(queue_entry_t *queue ODP_UNUSED) { } -======= ->>>>>>> v1.13.0.0 /* Fill in scheduler interface */ const schedule_fn_t schedule_sp_fn = { .pktio_start = pktio_start, @@ -861,12 +829,8 @@ const schedule_fn_t schedule_sp_fn = { .term_local = term_local, .order_lock = order_lock, .order_unlock = order_unlock, -<<<<<<< HEAD .max_ordered_locks = max_ordered_locks, .save_context = save_context -======= - .max_ordered_locks = max_ordered_locks ->>>>>>> v1.13.0.0 }; /* Fill in scheduler API calls */ From patchwork Fri Jan 27 14:29:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92663 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp232170obz; Fri, 27 Jan 2017 06:38:26 -0800 (PST) X-Received: by 10.233.223.129 with SMTP id t123mr8032639qkf.191.1485527906158; Fri, 27 Jan 2017 06:38:26 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i50si3660237qta.73.2017.01.27.06.38.25; Fri, 27 Jan 2017 06:38:26 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D11AC62DE5; Fri, 27 Jan 2017 14:38:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9AA3960DC9; Fri, 27 Jan 2017 14:31:44 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B511660DC9; Fri, 27 Jan 2017 14:31:35 +0000 (UTC) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by lists.linaro.org (Postfix) with ESMTPS id 8248C60D73 for ; Fri, 27 Jan 2017 14:29:58 +0000 (UTC) Received: by mail-lf0-f53.google.com with SMTP id x1so76117962lff.0 for ; Fri, 27 Jan 2017 06:29:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fbxf+Uuar7aDyYLWfCLbuR1MVdzkoc/uj4zW3pZwblk=; b=U+VY6IYJmDWZGt9RfFcCxCuiTISlZS8dgRU99eo+3Xzas4sm+dgMzirGXI/TA/SGgb IG0r1q2Q39TO70kwmepKcV/3FY3G2u+AgzKcpj7h5n8ROOk5j4GJcAoNoMWZl0UudW8Z 04TGD5JiL2FDYl9W5F6HNo3Y8zzJaBFxV8p1Y073o7GsYOXMzE4nmirnLNaTi/D+pHrb FQ4y+7YfROqf7QkpD4CrvqB2EIJdt5eCoN6pDohcWStZzHxX9gDHi1jBPWwV0STFkAh3 WvbSiT7DckK/3yT9jRl5DA8v4lllJaLoEuXnY6mefA6IA905LtfXXhT3GzOt6iTFpVi5 ILnA== X-Gm-Message-State: AIkVDXLctlHTw1fE5DiRBzGUMfzlH+ixJBTOmG2k2ZFHKpBJCfZrC7APA0o3JfjcJzk+FF4buOc= X-Received: by 10.25.34.196 with SMTP id i187mr2902046lfi.176.1485527397294; Fri, 27 Jan 2017 06:29:57 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:56 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:18 +0300 Message-Id: <20170127142921.29029-13-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 12/15] merge fix: odp_crypto_test_inp.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- .../validation/api/crypto/odp_crypto_test_inp.c | 43 ---------------------- 1 file changed, 43 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index 66d61486..80689387 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -96,7 +96,6 @@ static void alg_test(odp_crypto_op_t op, odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; int num, i; int found; -<<<<<<< HEAD rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); @@ -132,13 +131,10 @@ static void alg_test(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && !(capa.auths.bit.sha256_hmac)) rc = -1; -======= ->>>>>>> v1.13.0.0 CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); -<<<<<<< HEAD num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, MAX_ALG_CAPA); @@ -148,28 +144,6 @@ static void alg_test(odp_crypto_op_t op, } else { CU_ASSERT(num == 0); found = 1; -======= - if (capability.hw_ciphers.all_bits) { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.hw_ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.hw_ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.hw_ciphers.bit.aes_gcm)) - rc = -1; - } else { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.ciphers.bit.aes_gcm)) - rc = -1; ->>>>>>> v1.13.0.0 } CU_ASSERT(num <= MAX_ALG_CAPA); @@ -177,7 +151,6 @@ static void alg_test(odp_crypto_op_t op, if (num > MAX_ALG_CAPA) num = MAX_ALG_CAPA; -<<<<<<< HEAD /* Search for the test case */ for (i = 0; i < num; i++) { if (cipher_capa[i].key_len == cipher_key.length && @@ -197,22 +170,6 @@ static void alg_test(odp_crypto_op_t op, } else { CU_ASSERT(num == 0); found = 1; -======= - if (capability.hw_auths.all_bits) { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.hw_auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.hw_auths.bit.null)) - rc = -1; - } else { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.auths.bit.null)) - rc = -1; ->>>>>>> v1.13.0.0 } CU_ASSERT(num <= MAX_ALG_CAPA); From patchwork Fri Jan 27 14:29:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92662 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp231996obz; Fri, 27 Jan 2017 06:38:02 -0800 (PST) X-Received: by 10.200.34.146 with SMTP id f18mr8538730qta.39.1485527882737; Fri, 27 Jan 2017 06:38:02 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x2si3652923qke.126.2017.01.27.06.38.02; Fri, 27 Jan 2017 06:38:02 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 605A462DFA; Fri, 27 Jan 2017 14:38:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, TVD_SPACE_RATIO, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 615CF60D73; Fri, 27 Jan 2017 14:31:40 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2C47362E0B; Fri, 27 Jan 2017 14:31:35 +0000 (UTC) Received: from mail-lf0-f42.google.com (mail-lf0-f42.google.com [209.85.215.42]) by lists.linaro.org (Postfix) with ESMTPS id AED7A60DF2 for ; Fri, 27 Jan 2017 14:29:59 +0000 (UTC) Received: by mail-lf0-f42.google.com with SMTP id x1so76118266lff.0 for ; Fri, 27 Jan 2017 06:29:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yo43jaMROKdMcdp1NaIPYJL1NLmTpm1ysllgUC79uC8=; b=R16ScSdl9xPZvudIaxL2ByDFLEu28jXuxQzYUGHs/IGTxnL+wL3FPocjypJrdRXT2h Rn72JIMt/37PbxgYWo/x4RCbCxw9cjFCljx3jPpbCChvQVXA1rchATOvgC0Ns5kX8oae eWHgR1FuHcgH9VopYOBN/5e1viWUqixhKzv8m+bbWhdyKHo6Nfv53WSwfG53l12E0tzF 0S9f3mLCb5lZwAHefMdleFurLE0oF5uvYrQXATPuZwuD8tWx7hnagyapVScxeCrKPBJI NHvMCEaT20V3559eo6uGtMYcZiH1spvLdeyMymMR8prHDn/frD2BjVao8a9HgWYSpDML Co9g== X-Gm-Message-State: AIkVDXI+dCI3/sdZrAOnxTevEswGEhgkMBU9b23/4G/NThoaSMLUUIVB04Qf2BpSokh6laPls/c= X-Received: by 10.25.199.14 with SMTP id x14mr2353155lff.13.1485527398226; Fri, 27 Jan 2017 06:29:58 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:57 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:19 +0300 Message-Id: <20170127142921.29029-14-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 13/15] merge fix: test/common_plat/validation/api/packet/packet.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- test/common_plat/validation/api/packet/packet.h | 3 --- 1 file changed, 3 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/test/common_plat/validation/api/packet/packet.h b/test/common_plat/validation/api/packet/packet.h index 95923bc2..783b7a11 100644 --- a/test/common_plat/validation/api/packet/packet.h +++ b/test/common_plat/validation/api/packet/packet.h @@ -35,10 +35,7 @@ void packet_test_concat_extend_trunc(void); void packet_test_extend_small(void); void packet_test_extend_large(void); void packet_test_extend_mix(void); -<<<<<<< HEAD void packet_test_extend_ref(void); -======= ->>>>>>> v1.13.0.0 void packet_test_align(void); void packet_test_offset(void); void packet_test_ref(void); From patchwork Fri Jan 27 14:29:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92664 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp232373obz; Fri, 27 Jan 2017 06:38:56 -0800 (PST) X-Received: by 10.55.209.203 with SMTP id o72mr8284514qkl.281.1485527936896; Fri, 27 Jan 2017 06:38:56 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f9si3647640qki.259.2017.01.27.06.38.56; Fri, 27 Jan 2017 06:38:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 817C9609D2; Fri, 27 Jan 2017 14:38:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D9C7C60DC1; Fri, 27 Jan 2017 14:31:48 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9A3D9609AD; Fri, 27 Jan 2017 14:31:37 +0000 (UTC) Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by lists.linaro.org (Postfix) with ESMTPS id BE455609AD for ; Fri, 27 Jan 2017 14:30:00 +0000 (UTC) Received: by mail-lf0-f51.google.com with SMTP id n124so162428582lfd.2 for ; Fri, 27 Jan 2017 06:30:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZOS0k9BL0yaSGthu54ZkbL/KcaQdaiTOm39ed19atz8=; b=IN8Odjn6Ah2lcD5EDm2cshNYnIrf3GpxEGqtE37ZISzO0boc6Fw1zftDg7biN9sk0X YPGAQQj8b7j+PpnxN55y3PeQtaQmsXZdGm6H0ntnab0CAdySkAl0BfoEUOVfFMjNdkad SOOK/SrOTmYgXAhrFD4f0VE6Yjlks33SIhfe/ckLgWKuzlBTUqZxymxnxYazBtdYVnT5 F8BGf1415F6boPYnoy5n6mfxIzW1NNyd76gRYNuaYonsDujnVU9qrysoKSoKex5TQBS+ c4cHHJ9ENufk0ViUPSemeyD+CEOQEEtxr9JkPWXqLifvv+RzUPmCd+Be7Uj6APLJoLxh wkTg== X-Gm-Message-State: AIkVDXKmk0Qd4f0erg+FHdPHF0lwhb/kMe3ZyVh+vtx9+8K9EPRMk6+1C6+AL60x9T+JsT7/HsE= X-Received: by 10.25.27.147 with SMTP id b141mr2962107lfb.183.1485527399187; Fri, 27 Jan 2017 06:29:59 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:58 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:20 +0300 Message-Id: <20170127142921.29029-15-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 14/15] merge fix: test/common_plat/validation/api/packet/packet.c X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Maxim Uvarov --- test/common_plat/validation/api/packet/packet.c | 483 ------------------------ 1 file changed, 483 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c index f62227ab..41a4c878 100644 --- a/test/common_plat/validation/api/packet/packet.c +++ b/test/common_plat/validation/api/packet/packet.c @@ -1342,7 +1342,6 @@ void packet_test_concatsplit(void) CU_ASSERT(odp_packet_len(pkt) == odp_packet_len(segmented_test_packet)); packet_compare_data(pkt, segmented_test_packet); -<<<<<<< HEAD odp_packet_free(pkt); } @@ -1498,8 +1497,6 @@ void packet_test_concat_extend_trunc(void) CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); cur_len = odp_packet_len(pkt); CU_ASSERT(cur_len == odp_packet_unshared_len(pkt)); -======= ->>>>>>> v1.13.0.0 odp_packet_free(pkt); @@ -1917,483 +1914,6 @@ void packet_test_extend_ref(void) odp_packet_free(max_pkt); } -void packet_test_concat_small(void) -{ - odp_pool_capability_t capa; - odp_pool_t pool; - odp_pool_param_t param; - odp_packet_t pkt, pkt2; - int ret; - uint8_t *data; - uint32_t i; - uint32_t len = 32000; - uint8_t buf[len]; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; - - odp_pool_param_init(¶m); - - param.type = ODP_POOL_PACKET; - param.pkt.len = len; - param.pkt.num = 100; - - pool = odp_pool_create("packet_pool_concat", ¶m); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); - - pkt = odp_packet_alloc(pool, 1); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - - data = odp_packet_data(pkt); - *data = 0; - - for (i = 0; i < len - 1; i++) { - pkt2 = odp_packet_alloc(pool, 1); - CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); - - data = odp_packet_data(pkt2); - *data = i + 1; - - ret = odp_packet_concat(&pkt, pkt2); - CU_ASSERT(ret >= 0); - - if (ret < 0) { - odp_packet_free(pkt2); - break; - } - } - - CU_ASSERT(odp_packet_len(pkt) == len); - - len = odp_packet_len(pkt); - - memset(buf, 0, len); - CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); - - for (i = 0; i < len; i++) - CU_ASSERT(buf[i] == (i % 256)); - - odp_packet_free(pkt); - - CU_ASSERT(odp_pool_destroy(pool) == 0); -} - -void packet_test_concat_extend_trunc(void) -{ - odp_pool_capability_t capa; - odp_pool_t pool; - odp_pool_param_t param; - odp_packet_t pkt, pkt2; - int i, ret; - uint32_t alloc_len, ext_len, trunc_len, cur_len; - uint32_t len = 1900; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; - - alloc_len = len / 8; - ext_len = len / 4; - trunc_len = len / 3; - - odp_pool_param_init(¶m); - - param.type = ODP_POOL_PACKET; - param.pkt.len = len; - param.pkt.num = 100; - - pool = odp_pool_create("packet_pool_concat", ¶m); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); - - pkt = odp_packet_alloc(pool, alloc_len); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - - cur_len = odp_packet_len(pkt); - - for (i = 0; i < 2; i++) { - pkt2 = odp_packet_alloc(pool, alloc_len); - CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); - - ret = odp_packet_concat(&pkt, pkt2); - CU_ASSERT(ret >= 0); - - if (ret < 0) - odp_packet_free(pkt2); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); - cur_len = odp_packet_len(pkt); - } - - ret = odp_packet_extend_tail(&pkt, ext_len, NULL, NULL); - CU_ASSERT(ret >= 0); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); - cur_len = odp_packet_len(pkt); - - ret = odp_packet_extend_head(&pkt, ext_len, NULL, NULL); - CU_ASSERT(ret >= 0); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len + ext_len)); - cur_len = odp_packet_len(pkt); - - pkt2 = odp_packet_alloc(pool, alloc_len); - CU_ASSERT_FATAL(pkt2 != ODP_PACKET_INVALID); - - ret = odp_packet_concat(&pkt, pkt2); - CU_ASSERT(ret >= 0); - - if (ret < 0) - odp_packet_free(pkt2); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len + alloc_len)); - cur_len = odp_packet_len(pkt); - - ret = odp_packet_trunc_head(&pkt, trunc_len, NULL, NULL); - CU_ASSERT(ret >= 0); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); - cur_len = odp_packet_len(pkt); - - ret = odp_packet_trunc_tail(&pkt, trunc_len, NULL, NULL); - CU_ASSERT(ret >= 0); - - CU_ASSERT(odp_packet_len(pkt) == (cur_len - trunc_len)); - cur_len = odp_packet_len(pkt); - - odp_packet_free(pkt); - - CU_ASSERT(odp_pool_destroy(pool) == 0); -} - -void packet_test_extend_small(void) -{ - odp_pool_capability_t capa; - odp_pool_t pool; - odp_pool_param_t param; - odp_packet_t pkt; - int ret, round; - uint8_t *data; - uint32_t i, seg_len; - int tail = 1; - uint32_t len = 32000; - uint8_t buf[len]; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; - - odp_pool_param_init(¶m); - - param.type = ODP_POOL_PACKET; - param.pkt.len = len; - param.pkt.num = 100; - - pool = odp_pool_create("packet_pool_extend", ¶m); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); - - for (round = 0; round < 2; round++) { - pkt = odp_packet_alloc(pool, 1); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - - data = odp_packet_data(pkt); - *data = 0; - - for (i = 0; i < len - 1; i++) { - if (tail) { - ret = odp_packet_extend_tail(&pkt, 1, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - } else { - ret = odp_packet_extend_head(&pkt, 1, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - } - - if (ret < 0) - break; - - if (tail) { - /* assert needs brackets */ - CU_ASSERT(seg_len == 1); - } else { - CU_ASSERT(seg_len > 0); - } - - *data = i + 1; - } - - CU_ASSERT(odp_packet_len(pkt) == len); - - len = odp_packet_len(pkt); - - memset(buf, 0, len); - CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); - - for (i = 0; i < len; i++) { - int match; - - if (tail) { - match = (buf[i] == (i % 256)); - CU_ASSERT(match); - } else { - match = (buf[len - 1 - i] == (i % 256)); - CU_ASSERT(match); - } - - /* Limit the number of failed asserts to - one per packet */ - if (!match) - break; - } - - odp_packet_free(pkt); - - tail = 0; - } - - CU_ASSERT(odp_pool_destroy(pool) == 0); -} - -void packet_test_extend_large(void) -{ - odp_pool_capability_t capa; - odp_pool_t pool; - odp_pool_param_t param; - odp_packet_t pkt; - int ret, round; - uint8_t *data; - uint32_t i, seg_len, ext_len, cur_len, cur_data; - int tail = 1; - int num_div = 16; - int div = 1; - uint32_t len = 32000; - uint8_t buf[len]; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; - - odp_pool_param_init(¶m); - - param.type = ODP_POOL_PACKET; - param.pkt.len = len; - param.pkt.num = 100; - - pool = odp_pool_create("packet_pool_extend", ¶m); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); - - for (round = 0; round < 2 * num_div; round++) { - ext_len = len / div; - cur_len = ext_len; - - pkt = odp_packet_alloc(pool, ext_len); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - - cur_data = 0; - - if (tail) { - ret = fill_data_forward(pkt, 0, ext_len, &cur_data); - CU_ASSERT(ret == 0); - } else { - ret = fill_data_backward(pkt, 0, ext_len, &cur_data); - CU_ASSERT(ret == 0); - } - - while (cur_len < len) { - if ((len - cur_len) < ext_len) - ext_len = len - cur_len; - - if (tail) { - ret = odp_packet_extend_tail(&pkt, ext_len, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - } else { - ret = odp_packet_extend_head(&pkt, ext_len, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - } - - if (ret < 0) - break; - - if (tail) { - /* assert needs brackets */ - CU_ASSERT((seg_len > 0) && - (seg_len <= ext_len)); - ret = fill_data_forward(pkt, cur_len, ext_len, - &cur_data); - CU_ASSERT(ret == 0); - } else { - CU_ASSERT(seg_len > 0); - CU_ASSERT(data == odp_packet_data(pkt)); - ret = fill_data_backward(pkt, 0, ext_len, - &cur_data); - CU_ASSERT(ret == 0); - } - - cur_len += ext_len; - } - - CU_ASSERT(odp_packet_len(pkt) == len); - - len = odp_packet_len(pkt); - - memset(buf, 0, len); - CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); - - for (i = 0; i < len; i++) { - int match; - - if (tail) { - match = (buf[i] == (i % 256)); - CU_ASSERT(match); - } else { - match = (buf[len - 1 - i] == (i % 256)); - CU_ASSERT(match); - } - - /* Limit the number of failed asserts to - one per packet */ - if (!match) - break; - } - - odp_packet_free(pkt); - - div++; - if (div > num_div) { - /* test extend head */ - div = 1; - tail = 0; - } - } - - CU_ASSERT(odp_pool_destroy(pool) == 0); -} - -void packet_test_extend_mix(void) -{ - odp_pool_capability_t capa; - odp_pool_t pool; - odp_pool_param_t param; - odp_packet_t pkt; - int ret, round; - uint8_t *data; - uint32_t i, seg_len, ext_len, cur_len, cur_data; - int small_count; - int tail = 1; - uint32_t len = 32000; - uint8_t buf[len]; - - CU_ASSERT_FATAL(odp_pool_capability(&capa) == 0); - - if (capa.pkt.max_len && capa.pkt.max_len < len) - len = capa.pkt.max_len; - - odp_pool_param_init(¶m); - - param.type = ODP_POOL_PACKET; - param.pkt.len = len; - param.pkt.num = 100; - - pool = odp_pool_create("packet_pool_extend", ¶m); - CU_ASSERT(packet_pool != ODP_POOL_INVALID); - - for (round = 0; round < 2; round++) { - small_count = 30; - ext_len = len / 10; - cur_len = ext_len; - - pkt = odp_packet_alloc(pool, ext_len); - CU_ASSERT_FATAL(pkt != ODP_PACKET_INVALID); - - cur_data = 0; - - if (tail) { - ret = fill_data_forward(pkt, 0, ext_len, &cur_data); - CU_ASSERT(ret == 0); - } else { - ret = fill_data_backward(pkt, 0, ext_len, &cur_data); - CU_ASSERT(ret == 0); - } - - while (cur_len < len) { - if (small_count) { - small_count--; - ext_len = len / 100; - } else { - ext_len = len / 4; - } - - if ((len - cur_len) < ext_len) - ext_len = len - cur_len; - - if (tail) { - ret = odp_packet_extend_tail(&pkt, ext_len, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - CU_ASSERT((seg_len > 0) && - (seg_len <= ext_len)); - ret = fill_data_forward(pkt, cur_len, ext_len, - &cur_data); - CU_ASSERT(ret == 0); - } else { - ret = odp_packet_extend_head(&pkt, ext_len, - (void **)&data, - &seg_len); - CU_ASSERT(ret >= 0); - CU_ASSERT(seg_len > 0); - CU_ASSERT(data == odp_packet_data(pkt)); - ret = fill_data_backward(pkt, 0, ext_len, - &cur_data); - CU_ASSERT(ret == 0); - } - - cur_len += ext_len; - } - - CU_ASSERT(odp_packet_len(pkt) == len); - - len = odp_packet_len(pkt); - - memset(buf, 0, len); - CU_ASSERT(odp_packet_copy_to_mem(pkt, 0, len, buf) == 0); - - for (i = 0; i < len; i++) { - int match; - - if (tail) { - match = (buf[i] == (i % 256)); - CU_ASSERT(match); - } else { - match = (buf[len - 1 - i] == (i % 256)); - CU_ASSERT(match); - } - - /* Limit the number of failed asserts to - one per packet */ - if (!match) - break; - } - - odp_packet_free(pkt); - - tail = 0; - } - - CU_ASSERT(odp_pool_destroy(pool) == 0); -} - void packet_test_align(void) { odp_packet_t pkt; @@ -2790,10 +2310,7 @@ odp_testinfo_t packet_suite[] = { ODP_TEST_INFO(packet_test_extend_small), ODP_TEST_INFO(packet_test_extend_large), ODP_TEST_INFO(packet_test_extend_mix), -<<<<<<< HEAD ODP_TEST_INFO(packet_test_extend_ref), -======= ->>>>>>> v1.13.0.0 ODP_TEST_INFO(packet_test_align), ODP_TEST_INFO(packet_test_offset), ODP_TEST_INFO(packet_test_ref), From patchwork Fri Jan 27 14:29:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92665 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp232742obz; Fri, 27 Jan 2017 06:39:50 -0800 (PST) X-Received: by 10.55.190.199 with SMTP id o190mr8410438qkf.292.1485527990822; Fri, 27 Jan 2017 06:39:50 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q190si3645139qkd.267.2017.01.27.06.39.50; Fri, 27 Jan 2017 06:39:50 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 747EE609D2; Fri, 27 Jan 2017 14:39:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 27BA062E0B; Fri, 27 Jan 2017 14:31:51 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id DEDAF60D6C; Fri, 27 Jan 2017 14:31:37 +0000 (UTC) Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by lists.linaro.org (Postfix) with ESMTPS id C5E8560D79 for ; Fri, 27 Jan 2017 14:30:01 +0000 (UTC) Received: by mail-lf0-f52.google.com with SMTP id x1so76118833lff.0 for ; Fri, 27 Jan 2017 06:30:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DtVhCVj4Mtno96Q8tM3670ZwZxxSfBZdBtwvMKzhdV4=; b=nTkPXGQiWt3BuLe84SBpCIoKejBzGZSuD4xRmBlabducAOzFUm39nea6gMWKARqxBi ioltTj4CwnjGV5y5v5P5spFYX1AcJ9ZoBIjkJuO7utS7Cp34e+V9o+jqmXsE1Hn5MU0W RTROnDAN/RSXe2EmwRz9eJQAwp7zuSpI1yx31TIPwGHomjOSyJtcVjCxPHGV9DQrN3sA c2Rumt/D9GORnBF/V05JFkN9nyHqhwmVE61aOlhB9D6SRcZHu1CcHIKUQijZcACf6Uw4 OoW42VWzRe0Woya4loZ4iTTxHygJOjpRUcbszEzTrevfEtwZgIpaXbJt2ur9xa1gAHlb m12w== X-Gm-Message-State: AIkVDXLecMmAs3M0UDBPTuU02xoeWfEnUgbpIcZoi96FPqpndMlYjZyXti7WcQw9Zi4s59VexAc= X-Received: by 10.25.92.2 with SMTP id q2mr2803858lfb.121.1485527400365; Fri, 27 Jan 2017 06:30:00 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:59 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:21 +0300 Message-Id: <20170127142921.29029-16-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 15/15] linux-gen: support older libconfig version X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Travis CI uses old libconfig8 amd64 1.3.2-2ubuntu2, which does not have defines for errors. Move error print under ifdef to fix compilation. Signed-off-by: Maxim Uvarov --- platform/linux-generic/odp_init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.11.0.295.gd7dffce Reviewed-by: Christophe Milard diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 2cd8fe3f..685e02fa 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -130,12 +130,17 @@ static int read_configfile(void) if (config_filename) { ODP_DBG("Reading configuration file: %s\n", config_filename); if (!config_read_file(cf, config_filename)) { +#if defined(LIBCONFIG_VER_MAJOR) && LIBCONFIG_VER_MAJOR >= 1 && \ + LIBCONFIG_VER_MINOR >= 4 ODP_ERR("%s:%d - %s\n", config_error_file(cf), config_error_line(cf), config_error_text(cf)); +#else + ODP_ERR("config_read_file\n"); +#endif config_destroy(cf); - return(-1); + return -1; } }