From patchwork Mon Oct 23 10:00:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116675 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4461580qgn; Mon, 23 Oct 2017 03:09:29 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SvaCFSu3969T0swNKxehscnFNk1I3/OmAmDPncPLz0nv5SkQ5sX1qJ2N51HllatLM5ihQr X-Received: by 10.200.3.159 with SMTP id t31mr17942257qtg.102.1508753369283; Mon, 23 Oct 2017 03:09:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508753369; cv=none; d=google.com; s=arc-20160816; b=J98idlHSv0tpP31HkRKVqAV1yWWyaOGneudwJW+mnOL3LmQVKAxFkk7veN5WfyTXLD XO3x6LSQUtarfOVCWz7ISoNfl0DXCTAPoYSDqaZqKN2s3hnmdeu6jMNmk2K+F7/jTgyM tbdDd8UZaN5XarrYw29bO9GsryKy6YRKCdf7q6lPBqeaWCvrdzhlGj0IUjTtH39wK6Rx JWthl43S65+X/LOtGvkHvrm4KjUK+LOtaWUDtbujd0+2N/79vV2t0o5HtaJZj/4mU5W9 b4GksKKbS9YzO3EL0LHShwTVLEFVoi/xYV0M5gZaHLUutIEQ2fcvinw+xHhtbrxFkrs9 kULg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=c+EZj8IxOCKlcOr9lfi9o8cyWlOaoHWAUWDmdfsQa6k=; b=I4zrEaa1U4O8tekUtnvFFZP4A9kg9k4gEFTmjIKd6j9VWLyI/N5YNQD5kHjMlbQrYj +l8umIfPs1sL+y63C5tO41SyeBkmIUqQM3cMjxZcHDj9FO2giqxzwT1K+KsWnhNK/cjA Zg+4AAvp0kFrhibae2d7JCogbyWh8Vsf+mjWn2OIi9DIU4nfe0GEaqR/2igktRoP8MYt 7ru982dGzP3/3ZYIS9huwBnDL7J8/tOUDuOHUXB2qw4WB/drlxvYSa7D1q/kWo2dBXHP OF7k66CAAmNKFo/JqLieFphPRlMYe/zJwoDIBX6BArY/hAtmbKQeI97WqV7X0ztCkqIi Ph5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id c193si881756qkb.39.2017.10.23.03.09.29; Mon, 23 Oct 2017 03:09:29 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 02E5061D4C; Mon, 23 Oct 2017 10:09: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,FREEMAIL_FROM, 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 6F09161DF1; Mon, 23 Oct 2017 10:04:05 +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 17A5261BC5; Mon, 23 Oct 2017 10:04:01 +0000 (UTC) Received: from forward105p.mail.yandex.net (forward105p.mail.yandex.net [77.88.28.108]) by lists.linaro.org (Postfix) with ESMTPS id 1E0F161BC5 for ; Mon, 23 Oct 2017 10:00:43 +0000 (UTC) Received: from mxback9o.mail.yandex.net (mxback9o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::23]) by forward105p.mail.yandex.net (Yandex) with ESMTP id 904B84081EEE for ; Mon, 23 Oct 2017 13:00:31 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id hHTaCrSfGe-0V4C4egh; Mon, 23 Oct 2017 13:00:31 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fSL5x6gEpl-0V88RSqr; Mon, 23 Oct 2017 13:00:31 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 13:00:14 +0300 Message-Id: <1508752817-11952-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> References: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 246 Subject: [lng-odp] [PATCH API-NEXT v2 1/4] api: shm: style clean up 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" From: Petri Savolainen Clean up shm header file. Remove [in] Doxygen tags as function parameters are by default input. Move @note text to the main text block, as it's usual API specification text. Signed-off-by: Petri Savolainen --- /** Email created from pull request 246 (psavol:next-shm-print) ** https://github.com/Linaro/odp/pull/246 ** Patch: https://github.com/Linaro/odp/pull/246.patch ** Base sha: ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 ** Merge commit sha: fe0769b6e9387bbfabf68b538ec83a685f406da0 **/ include/odp/api/spec/shared_memory.h | 63 +++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 1a9c1299e..2c0db1021 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -50,6 +50,7 @@ extern "C" { */ #define ODP_SHM_SW_ONLY 0x1 /**< Application SW only, no HW access */ #define ODP_SHM_PROC 0x2 /**< Share with external processes */ + /** * Single virtual address * @@ -58,6 +59,7 @@ extern "C" { * of ODP thread type (e.g. pthread vs. process (or fork process time)). */ #define ODP_SHM_SINGLE_VA 0x4 + /** * Export memory * @@ -70,11 +72,20 @@ extern "C" { * Shared memory block info */ typedef struct odp_shm_info_t { - const char *name; /**< Block name */ - void *addr; /**< Block address */ - uint64_t size; /**< Block size in bytes */ - uint64_t page_size; /**< Memory page size */ - uint32_t flags; /**< ODP_SHM_* flags */ + /** Block name */ + const char *name; + + /** Block address */ + void *addr; + + /** Block size in bytes */ + uint64_t size; + + /** Memory page size */ + uint64_t page_size; + + /** ODP_SHM_* flags */ + uint32_t flags; } odp_shm_info_t; /** @@ -116,11 +127,10 @@ int odp_shm_capability(odp_shm_capability_t *capa); /** * Reserve a contiguous block of shared memory * - * @param[in] name Name of the block (maximum ODP_SHM_NAME_LEN - 1 chars) - * @param[in] size Block size in bytes - * @param[in] align Block alignment in bytes - * @param[in] flags Shared memory parameter flags (ODP_SHM_*). - * Default value is 0. + * @param name Name of the block (maximum ODP_SHM_NAME_LEN - 1 chars) + * @param size Block size in bytes + * @param align Block alignment in bytes + * @param flags Shared memory parameter flags (ODP_SHM_*). Default value is 0. * * @return Handle of the reserved block * @retval ODP_SHM_INVALID on failure @@ -131,10 +141,10 @@ odp_shm_t odp_shm_reserve(const char *name, uint64_t size, uint64_t align, /** * Free a contiguous block of shared memory * - * Frees a previously reserved block of shared memory. - * @note Freeing memory that is in use will result in UNDEFINED behavior + * Frees a previously reserved block of shared memory. Freeing memory that is + * in use will result in UNDEFINED behavior * - * @param[in] shm Block handle + * @param shm Block handle * * @retval 0 on success * @retval <0 on failure @@ -144,7 +154,7 @@ int odp_shm_free(odp_shm_t shm); /** * Lookup for a block of shared memory * - * @param[in] name Name of the block + * @param name Name of the block * * @return A handle to the block if it is found by name * @retval ODP_SHM_INVALID on failure @@ -177,20 +187,21 @@ odp_shm_t odp_shm_import(const char *remote_name, /** * Shared memory block address * - * @param[in] shm Block handle + * @param shm Block handle * * @return Memory block address * @retval NULL on failure */ void *odp_shm_addr(odp_shm_t shm); - /** * Shared memory block info - * @note This is the only shared memory API function which accepts invalid - * shm handles (any bit value) without causing undefined behavior. * - * @param[in] shm Block handle + * Get information about the specified shared memory block. This is the only + * shared memory API function which accepts invalid shm handles (any bit value) + * without causing undefined behavior. + * + * @param shm Block handle * @param[out] info Block info pointer for output * * @retval 0 on success @@ -207,15 +218,15 @@ void odp_shm_print_all(void); /** * Get printable value for an odp_shm_t * - * @param hdl odp_shm_t handle to be printed - * @return uint64_t value that can be used to print/display this - * handle + * This routine is intended to be used for diagnostic purposes to enable + * applications to generate a printable value that represents an odp_shm_t + * handle. + * + * @param shm Block handle * - * @note This routine is intended to be used for diagnostic purposes - * to enable applications to generate a printable value that represents - * an odp_shm_t handle. + * @return uint64_t value that can be used to print this handle */ -uint64_t odp_shm_to_u64(odp_shm_t hdl); +uint64_t odp_shm_to_u64(odp_shm_t shm); /** * @} From patchwork Mon Oct 23 10:00:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116669 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4456371qgn; Mon, 23 Oct 2017 03:03:57 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RoZQsm3Qn+kS63BfJ4LKROqxi+UwScm5vSo5MdUOZacYmRj1RmSmbIM8+DkpTKtgo/o7i5 X-Received: by 10.55.162.198 with SMTP id l189mr18076231qke.168.1508753037249; Mon, 23 Oct 2017 03:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508753037; cv=none; d=google.com; s=arc-20160816; b=JKRwCbVb7IrmsNuNBcvWSwc+k9A9xZY6pdsweU1Ox6OdyLgQ1fvgLZJJyX/QVciE56 fOTFUGdMTlBqAm/fsKEOyBSYzPcnkBp6mJO9eA6yLMHJxhTlBYAxlXNckNcSAZTMXtGt fvSpSdDVaZgmDHFi/3rHTy0J/Cmr3QXjLndKjUxaYeDnasYDV48s2VtDmfXrwzWcUdTq QlsePHs1zxTWevYMEuCiCPMfmqdQ2+PpzmAmOHajxJ1vM34ocNLUHmp26vhDO7mOI0VT I4D1K8r6A8KG1pESbHTSpcnzea9MqnTMR/cfWqEyayNVMHnaeJuzmniN3OObbkMGcTTP w0aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=lOzNT3kFLqxWSTYW0rG996+d25MEwxtrDAK7ceDDqLk=; b=p/zeDU8HEsbyvpP7+Pyd18HmCDyFAPDPNCl1gO45BS9vy7RVZx6WRcxHqIMsPrUCGA WxV0xy2a8CynPoLQ4LLrRgQjfXtnb1iSauMserVSctx/vT7L5f0Dtp++A9bNCTRjLZIN 4yqxzHhMnhG7XZ3WcMhlg3UBtCQT7hR10gKimBFzrNSXvJVbeNK11lxfJV+wvcavI0qf boq9obASI2aZMsuMsw1bVKoszMGQpLLNHKTnuBKW+EWWHckTg8EbKSSkUfhC1ojI6Yzw BqRql5uJOfpfUTpi6zJeGFwpTB/ePHTggutpE9xC5AT4NAewHrEgssEUYDm6VcL7qubP zICw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 72si2541824qks.203.2017.10.23.03.03.57; Mon, 23 Oct 2017 03:03:57 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id E873A61BBA; Mon, 23 Oct 2017 10:03: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 7E28861D19; Mon, 23 Oct 2017 10:02:22 +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 AA58B61D25; Mon, 23 Oct 2017 10:02:13 +0000 (UTC) Received: from forward106p.mail.yandex.net (forward106p.mail.yandex.net [77.88.28.109]) by lists.linaro.org (Postfix) with ESMTPS id 4BC3361630 for ; Mon, 23 Oct 2017 10:00:35 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward106p.mail.yandex.net (Yandex) with ESMTP id D64F22D85118 for ; Mon, 23 Oct 2017 13:00:33 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 58cApggXlL-0XMCRC7d; Mon, 23 Oct 2017 13:00:33 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fSL5x6gEpl-0W8iK7sX; Mon, 23 Oct 2017 13:00:32 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 13:00:15 +0300 Message-Id: <1508752817-11952-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> References: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 246 Subject: [lng-odp] [PATCH API-NEXT v2 2/4] api: shm: print shm block info 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" From: Petri Savolainen Added function to print debugging information about the specified shared memory block. Info is implementation defined but should include information about allocated memory addresses, pages, etc. Signed-off-by: Petri Savolainen --- /** Email created from pull request 246 (psavol:next-shm-print) ** https://github.com/Linaro/odp/pull/246 ** Patch: https://github.com/Linaro/odp/pull/246.patch ** Base sha: ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 ** Merge commit sha: fe0769b6e9387bbfabf68b538ec83a685f406da0 **/ include/odp/api/spec/shared_memory.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/odp/api/spec/shared_memory.h b/include/odp/api/spec/shared_memory.h index 2c0db1021..60a0cdde3 100644 --- a/include/odp/api/spec/shared_memory.h +++ b/include/odp/api/spec/shared_memory.h @@ -209,13 +209,22 @@ void *odp_shm_addr(odp_shm_t shm); */ int odp_shm_info(odp_shm_t shm, odp_shm_info_t *info); - /** * Print all shared memory blocks */ void odp_shm_print_all(void); /** + * Print shared memory block info + * + * Print implementation defined information about the specified shared memory + * block to the ODP log. The information is intended to be used for debugging. + * + * @param shm Block handle + */ +void odp_shm_print(odp_shm_t shm); + +/** * Get printable value for an odp_shm_t * * This routine is intended to be used for diagnostic purposes to enable From patchwork Mon Oct 23 10:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116670 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4457280qgn; Mon, 23 Oct 2017 03:04:53 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QV19NFZZaUa63iHLS81Come+fZfWTrWcq/hga6CCNyMYwS8n25RrSeVhdez1IequdpYKP1 X-Received: by 10.55.157.133 with SMTP id g127mr17346367qke.296.1508753093300; Mon, 23 Oct 2017 03:04:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508753093; cv=none; d=google.com; s=arc-20160816; b=NAHMBwNc/sKeL9DZYcUmhs6r67F0KWT06YJeUeRpeSztpk3OY9ns1yI9PqYOkYGTVj Ay81QrPDWyfPltiEeott5KiqFRD+ORbvQzagkt32a2RmBpNdPi7sszkXCTP6xNRBm8oB sJy3WWcmSPLB3hK2PHzvzBsYaPbGCoNCJ6rwjyf/VFcLyhd+GW7o8kOvHRg5rULJC4u9 0nPCA8KUUCloDuTLibhkFWq/YN4W//ZpgkUTGcmkKRcLAm5q985Lw9h/xZiAswS2EyUg EPSL9fgxmdXOfMMWFsl5INVD8tvb31X7CqKHIdtaN0Jfb4IDGIhWE55AKXjCpQEY8iiy VWQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=85imsmLmiQ4TsWRpSCXlynIkN4LJrz74ya9+5I1hVq8=; b=m3GpXiXfjRTAJ4CO4Li7FWOouKg6n1tMwMOQnXB/KsDMRjGJhS2dVvuqS1y6ub+Oei rf0mHOZkG7tjGHqGbwsnNUlmbI2Bqwro0pFI6mc8kwHjqh5QDNbw/uSsEYqnC7O6mxGG JArkHtER1+GWaD1VXIIv3jBB1e+VhIXSMSC14TL9TnHXP+ZviCY+E9xJ7q0o7omMfPLz OiZDJrvv0n694RvnFRv/zeLHKrp68vLaPyffHspBK8sQmOkLBJJrAW6nJQQq8ul1Cj7W IEYTbROeCjQz6drZiSLJJMAdaMMTIILOxLzyKAXtz5IMsm48SWrGKnEvZ3J9TB5n7UkB 3moA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id i48si5272848qta.66.2017.10.23.03.04.53; Mon, 23 Oct 2017 03:04:53 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id F2ACB61D1D; Mon, 23 Oct 2017 10:04:52 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 E316361D39; Mon, 23 Oct 2017 10:02: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 5C1EE61D30; Mon, 23 Oct 2017 10:02:29 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 311F46164A for ; Mon, 23 Oct 2017 10:00:36 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward100p.mail.yandex.net (Yandex) with ESMTP id B2ED25104908 for ; Mon, 23 Oct 2017 13:00:34 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tl7jwdyjWH-0Yvu2XUA; Mon, 23 Oct 2017 13:00:34 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fSL5x6gEpl-0Y8GZ3rZ; Mon, 23 Oct 2017 13:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 13:00:16 +0300 Message-Id: <1508752817-11952-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> References: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 246 Subject: [lng-odp] [PATCH API-NEXT v2 3/4] linux-gen: shm: make odp_shm_print_all readable again 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" From: Petri Savolainen Use ODP_PRINT instead of ODP_DBG in the print function. The idea of a print function is that it prints information when application calls it. ODP_DBG does not print anything by default. Format printted output to be a readable table of shm blocks. Signed-off-by: Petri Savolainen --- /** Email created from pull request 246 (psavol:next-shm-print) ** https://github.com/Linaro/odp/pull/246 ** Patch: https://github.com/Linaro/odp/pull/246.patch ** Base sha: ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 ** Merge commit sha: fe0769b6e9387bbfabf68b538ec83a685f406da0 **/ platform/linux-generic/_ishm.c | 69 +++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index 6e5bc61fe..e7a6c2357 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1708,11 +1708,28 @@ int _odp_ishm_status(const char *title) int nb_allocated_frgments = 0; /* nb frag describing an allocated VA */ int nb_blocks = 0; int single_va_blocks = 0; + int max_name_len = 0; odp_spinlock_lock(&ishm_tbl->lock); procsync(); - ODP_DBG("ishm blocks allocated at: %s\n", title); + /* find longest block name */ + for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { + int str_len; + + if (ishm_tbl->block[i].len <= 0) + continue; + + str_len = strlen(ishm_tbl->block[i].name); + + if (max_name_len < str_len) + max_name_len = str_len; + } + + ODP_PRINT("ishm blocks allocated at: %s\n", title); + + ODP_PRINT(" %-*s flag len user_len seq ref start fd" + " file\n", max_name_len, "name"); /* display block table: 1 line per entry +1 extra line if mapped here */ for (i = 0; i < ISHM_MAX_NB_BLOCKS; i++) { @@ -1742,41 +1759,39 @@ int _odp_ishm_status(const char *title) huge = '?'; } proc_index = procfind_block(i); - ODP_DBG("%-3d: name:%-.24s file:%-.24s" - " flags:%s,%c len:0x%-08lx" - " user_len:%-8ld seq:%-3ld refcnt:%-4d\n", - i, - ishm_tbl->block[i].name, - ishm_tbl->block[i].filename, - flags, huge, - ishm_tbl->block[i].len, - ishm_tbl->block[i].user_len, - ishm_tbl->block[i].seq, - ishm_tbl->block[i].refcnt); + ODP_PRINT("%2i %-*s %s%c 0x%-08lx %-8lu %-3lu %-3lu", + i, max_name_len, ishm_tbl->block[i].name, + flags, huge, + ishm_tbl->block[i].len, + ishm_tbl->block[i].user_len, + ishm_tbl->block[i].seq, + ishm_tbl->block[i].refcnt); if (proc_index < 0) continue; - ODP_DBG(" start:%-08lx fd:%-3d\n", - ishm_proctable->entry[proc_index].start, - ishm_proctable->entry[proc_index].fd); + ODP_PRINT("%-08lx %-3d", + ishm_proctable->entry[proc_index].start, + ishm_proctable->entry[proc_index].fd); + + ODP_PRINT("%s\n", ishm_tbl->block[i].filename); } /* display the virtual space allocations... : */ - ODP_DBG("ishm virtual space:\n"); + ODP_PRINT("\nishm virtual space:\n"); for (fragmnt = ishm_ftbl->used_fragmnts; fragmnt; fragmnt = fragmnt->next) { if (fragmnt->block_index >= 0) { nb_allocated_frgments++; - ODP_DBG(" %08p - %08p: ALLOCATED by block:%d\n", - (uintptr_t)fragmnt->start, - (uintptr_t)fragmnt->start + fragmnt->len - 1, - fragmnt->block_index); + ODP_PRINT(" %08p - %08p: ALLOCATED by block:%d\n", + (uintptr_t)fragmnt->start, + (uintptr_t)fragmnt->start + fragmnt->len - 1, + fragmnt->block_index); consecutive_unallocated = 0; } else { - ODP_DBG(" %08p - %08p: NOT ALLOCATED\n", - (uintptr_t)fragmnt->start, - (uintptr_t)fragmnt->start + fragmnt->len - 1); + ODP_PRINT(" %08p - %08p: NOT ALLOCATED\n", + (uintptr_t)fragmnt->start, + (uintptr_t)fragmnt->start + fragmnt->len - 1); if (consecutive_unallocated++) ODP_ERR("defragmentation error\n"); } @@ -1807,9 +1822,9 @@ int _odp_ishm_status(const char *title) fragmnt; fragmnt = fragmnt->next) nb_unused_frgments++; - ODP_DBG("ishm: %d fragment used. %d fragments unused. (total=%d)\n", - nb_used_frgments, nb_unused_frgments, - nb_used_frgments + nb_unused_frgments); + ODP_PRINT("ishm: %d fragment used. %d fragments unused. (total=%d)\n", + nb_used_frgments, nb_unused_frgments, + nb_used_frgments + nb_unused_frgments); if ((nb_used_frgments + nb_unused_frgments) != ISHM_NB_FRAGMNTS) ODP_ERR("lost fragments!\n"); @@ -1817,7 +1832,7 @@ int _odp_ishm_status(const char *title) if (nb_blocks < ishm_proctable->nb_entries) ODP_ERR("process known block cannot exceed main total sum!\n"); - ODP_DBG("\n"); + ODP_PRINT("\n"); odp_spinlock_unlock(&ishm_tbl->lock); return nb_blocks; From patchwork Mon Oct 23 10:00:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116671 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4458062qgn; Mon, 23 Oct 2017 03:05:40 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TVip5bk4AJN6phcjczBFQ6/A+jzFQInWW+m6dKKpukhiXMXnZ2mQvzg/WwScTWa3efyFpP X-Received: by 10.200.63.242 with SMTP id v47mr19659804qtk.29.1508753140807; Mon, 23 Oct 2017 03:05:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508753140; cv=none; d=google.com; s=arc-20160816; b=LKAzWG033+1ZUV45jyObcnFPEWxnyL1AgSmqlbQT+GoMcP76oc3zxywTIEUvmIDPnK 919bsqbQhVOw5DIaf062XOZEcxn/zTi1+UwBMwA8ZhVGi0tEzmb6YEHBv4VRtGVv5zzy IPqWyppIMbiNSS9wCw0q8E7N3mXjV/kzDYRz/NRelHv+yDzbHKlB7QOryNywFXOJiyg9 6ymUVJdPxtdtsHXaK8GSPakiksfIb+7GCy7R6gDV8rdszy6Ox2FNsATX4aVukjk5P0Is dPAdkZDOnzwSk0xnMXbmxy5coH9fbHzHVcaLakTz2d9ggDK5f8+5e/xjoeFszKDpw26e poxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=gAR6TvuZZ+vgXIh5B35DFAHl+XP9Qjc1DtAjUqpvkn4=; b=kVqEury+7XMetPKMnSiOX/nUkY8pW4XN63dbat2zE3fctezP+xKbKqoRqIJmLIl5zO NkdemlsZsjWKFe+iGG/nSSshQQjtzVDnXt3t9O42mc3zHdQllzBtroMmHlLB1kqN6a4V noCY3LXq77qxcwbMZ/Z+yvrSpYD2ZdYmSoEN9IL1SSG+MZf8E5sccRT00gbRLRjOdkoq ERyn8fDeH5iaKyzoP1mpoW5EGTLL8w9rc2zvt2bU1/RXEIPM5sqlI6G+hfFrpT/7NOSk sR/QkMi92KgSvGjCT87pAoZSf/deHJufXrRI8VaGrk5UUimK5cZqOF12sFo9KWYEQkKx 7RXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 100si345334qkx.263.2017.10.23.03.05.40; Mon, 23 Oct 2017 03:05:40 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 5242F61CBB; Mon, 23 Oct 2017 10:05:40 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 643F961D5D; Mon, 23 Oct 2017 10:02: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 B464F61D5E; Mon, 23 Oct 2017 10:02:43 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 7264861667 for ; Mon, 23 Oct 2017 10:00:36 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 50FFF5103866 for ; Mon, 23 Oct 2017 13:00:35 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8DXtmsGMfd-0ZDi3fH2; Mon, 23 Oct 2017 13:00:35 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id fSL5x6gEpl-0Y8W5PpF; Mon, 23 Oct 2017 13:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 13:00:17 +0300 Message-Id: <1508752817-11952-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> References: <1508752817-11952-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 246 Subject: [lng-odp] [PATCH API-NEXT v2 4/4] linux-gen: shm: implement odp_shm_print 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" From: Petri Savolainen Implement the new block level debug print function. Signed-off-by: Petri Savolainen --- /** Email created from pull request 246 (psavol:next-shm-print) ** https://github.com/Linaro/odp/pull/246 ** Patch: https://github.com/Linaro/odp/pull/246.patch ** Base sha: ec6510b33e8b96d6d6670efb9dc3c9101baed6c6 ** Merge commit sha: fe0769b6e9387bbfabf68b538ec83a685f406da0 **/ platform/linux-generic/_ishm.c | 49 +++++++++++++++++++++++++ platform/linux-generic/include/_ishm_internal.h | 1 + platform/linux-generic/odp_shared_memory.c | 5 +++ test/validation/api/shmem/shmem.c | 2 + 4 files changed, 57 insertions(+) diff --git a/platform/linux-generic/_ishm.c b/platform/linux-generic/_ishm.c index e7a6c2357..238efb81a 100644 --- a/platform/linux-generic/_ishm.c +++ b/platform/linux-generic/_ishm.c @@ -1837,3 +1837,52 @@ int _odp_ishm_status(const char *title) odp_spinlock_unlock(&ishm_tbl->lock); return nb_blocks; } + +void _odp_ishm_print(int block_index) +{ + ishm_block_t *block; + const char *str; + + odp_spinlock_lock(&ishm_tbl->lock); + + if ((block_index < 0) || + (block_index >= ISHM_MAX_NB_BLOCKS) || + (ishm_tbl->block[block_index].len == 0)) { + odp_spinlock_unlock(&ishm_tbl->lock); + ODP_ERR("Request for info on an invalid block\n"); + return; + } + + block = &ishm_tbl->block[block_index]; + + ODP_PRINT("\nSHM block info\n--------------\n"); + ODP_PRINT(" name: %s\n", block->name); + ODP_PRINT(" file: %s\n", block->filename); + ODP_PRINT(" expt: %s\n", block->exptname); + ODP_PRINT(" user_flags: 0x%x\n", block->user_flags); + ODP_PRINT(" flags: 0x%x\n", block->flags); + ODP_PRINT(" user_len: %lu\n", block->user_len); + ODP_PRINT(" start: %p\n", block->start); + ODP_PRINT(" len: %lu\n", block->len); + + switch (block->huge) { + case HUGE: + str = "huge"; + break; + case NORMAL: + str = "normal"; + break; + case EXTERNAL: + str = "external"; + break; + default: + str = "??"; + } + + ODP_PRINT(" page type: %s\n", str); + ODP_PRINT(" seq: %lu\n", block->seq); + ODP_PRINT(" refcnt: %lu\n", block->refcnt); + ODP_PRINT("\n"); + + odp_spinlock_unlock(&ishm_tbl->lock); +} diff --git a/platform/linux-generic/include/_ishm_internal.h b/platform/linux-generic/include/_ishm_internal.h index 005d6b551..34068bc0c 100644 --- a/platform/linux-generic/include/_ishm_internal.h +++ b/platform/linux-generic/include/_ishm_internal.h @@ -45,6 +45,7 @@ void *_odp_ishm_address(int block_index); int _odp_ishm_info(int block_index, _odp_ishm_info_t *info); int _odp_ishm_status(const char *title); int _odp_ishm_cleanup_files(const char *dirpath); +void _odp_ishm_print(int block_index); #ifdef __cplusplus } diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c index ccd25c8c8..aabecd9b0 100644 --- a/platform/linux-generic/odp_shared_memory.c +++ b/platform/linux-generic/odp_shared_memory.c @@ -116,6 +116,11 @@ void odp_shm_print_all(void) _odp_ishm_status("Memory allocation status:"); } +void odp_shm_print(odp_shm_t shm) +{ + _odp_ishm_print(from_handle(shm)); +} + uint64_t odp_shm_to_u64(odp_shm_t hdl) { return _odp_pri(hdl); diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c index 08587940c..d5335afa9 100644 --- a/test/validation/api/shmem/shmem.c +++ b/test/validation/api/shmem/shmem.c @@ -152,6 +152,8 @@ void shmem_test_basic(void) odp_cunit_thread_create(run_test_basic_thread, &thrdarg); CU_ASSERT(odp_cunit_thread_exit(&thrdarg) >= 0); + odp_shm_print(shm); + CU_ASSERT(0 == odp_shm_free(shm)); }