Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123641/?format=api
{ "id": 123641, "url": "http://patches.dpdk.org/api/patches/123641/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230210010724.890413-17-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230210010724.890413-17-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230210010724.890413-17-stephen@networkplumber.org", "date": "2023-02-10T01:07:24", "name": "[v3,16/16] pipeline: replace RTE_LOGTYPE_PIPELINE with dynamic log type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "86f4fada628072163ac2722aa8b89313911ba44a", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230210010724.890413-17-stephen@networkplumber.org/mbox/", "series": [ { "id": 26935, "url": "http://patches.dpdk.org/api/series/26935/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26935", "date": "2023-02-10T01:07:08", "name": "Replace use of static logtypes", "version": 3, "mbox": "http://patches.dpdk.org/series/26935/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123641/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/123641/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E265041C58;\n\tFri, 10 Feb 2023 02:09:49 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0725242D69;\n\tFri, 10 Feb 2023 02:08:28 +0100 (CET)", "from mail-pl1-f181.google.com (mail-pl1-f181.google.com\n [209.85.214.181])\n by mails.dpdk.org (Postfix) with ESMTP id 12D3A42D65\n for <dev@dpdk.org>; Fri, 10 Feb 2023 02:08:21 +0100 (CET)", "by mail-pl1-f181.google.com with SMTP id v23so4911871plo.1\n for <dev@dpdk.org>; Thu, 09 Feb 2023 17:08:21 -0800 (PST)", "from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218])\n by smtp.gmail.com with ESMTPSA id\n jd9-20020a170903260900b0019625428cefsm2103023plb.281.2023.02.09.17.08.18\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 09 Feb 2023 17:08:19 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20210112.gappssmtp.com; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=clf/jqv8wr39P/1rDP3iaIi7ECa5RQJd5A1SPvUnlhg=;\n b=icDNGEu50qykOGHoPdWjo+69US1tPT2FQy6NiQN6scg5meMB1KaZKoUsXsq71S4p07\n 8ZAgZWg3elG18RmbBsZjbaP9PdzAOJYoOVFh3W1MQcwrx6GgYb9uKringhywsmz1fUGF\n orUY25LZEd311PeG+mQg39WwVR100pP/pElA5kjdyzb6d64hJuNfwKXruWBO0TfL6lrf\n 955oB5BmWKCtP/ln/73B9zwCdqGnocd81DghEXzVUFOzDoiJc2MeM1weCLO/5pG7Mr3X\n 2MDxaECdYMm6z6c0vH8EquqbdiX+IivU6sT46iYIEp5mjbUAOzUNOjzZShz5rCJPqD4f\n U8Cg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=clf/jqv8wr39P/1rDP3iaIi7ECa5RQJd5A1SPvUnlhg=;\n b=Va7jK/lAyixw0obr4ddjldH2wR9u8TyPr/O2XauZUDeR6RTGeqS93KOVHgjEnTMlrU\n L5YecCcAlLezXnDFzPaU/2cCYWxF8GG2pjTFwAaZqd/cvWhIDbtEo9CkS9kFshz98wC8\n nGiz3E7T5HLJ9vBLvkj2Ih0iaDum/GzuR8CF4ZSpltKkdHd81GRwlZr1pPy5fPFXYzRZ\n jHC2jRHSzswuPX7xifNGe6iFS8hBxF++C6Ot7DsXDRTAEYOOd69OEdxaYNF23uuUcSvY\n 0oad5b6itvkhKP1JUjeK0qCOZ+9uenbiChBJSBNGetsEs3zcrw/5DVrhEV2DJWLAv/eO\n XKYw==", "X-Gm-Message-State": "AO0yUKUG3e5k75FkKlj32wVHJ2UpFuf5PgXljwAJ1jEvLWAA5sdNygi/\n pNEWbIChXnwpLQXu8WaUw/x8aTj6XIoRTYhhK+0=", "X-Google-Smtp-Source": "\n AK7set/IE9k74+ds2/xW4FFyE1SDgppCX2pI7SVKAts6Qam6SR7W3e+uEhjc/27tC7qJLVGk9jh9fg==", "X-Received": "by 2002:a17:902:ec90:b0:199:12d5:5b9b with SMTP id\n x16-20020a170902ec9000b0019912d55b9bmr15134941plg.25.1675991299739;\n Thu, 09 Feb 2023 17:08:19 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>", "Subject": "[PATCH v3 16/16] pipeline: replace RTE_LOGTYPE_PIPELINE with dynamic\n log type", "Date": "Thu, 9 Feb 2023 17:07:24 -0800", "Message-Id": "<20230210010724.890413-17-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230210010724.890413-1-stephen@networkplumber.org>", "References": "<20230207204151.1503491-1-stephen@networkplumber.org>\n <20230210010724.890413-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Split the static global PIPELINE log type into multiple suffix\nlog types (by stage).\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/eal/common/eal_common_log.c | 1 -\n lib/eal/include/rte_log.h | 2 +-\n lib/pipeline/rte_pipeline.c | 242 ++++++++++++--------------------\n 3 files changed, 87 insertions(+), 158 deletions(-)", "diff": "diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c\nindex a4e718e51d12..e4a4f7812bde 100644\n--- a/lib/eal/common/eal_common_log.c\n+++ b/lib/eal/common/eal_common_log.c\n@@ -350,7 +350,6 @@ struct logtype {\n static const struct logtype logtype_strings[] = {\n \t{RTE_LOGTYPE_EAL, \"lib.eal\"},\n \t{RTE_LOGTYPE_PMD, \"pmd\"},\n-\t{RTE_LOGTYPE_PIPELINE, \"lib.pipeline\"},\n \t{RTE_LOGTYPE_CRYPTODEV, \"lib.cryptodev\"},\n \t{RTE_LOGTYPE_EVENTDEV, \"lib.eventdev\"},\n \ndiff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h\nindex af87eb42ddb3..e2c11ad45c7f 100644\n--- a/lib/eal/include/rte_log.h\n+++ b/lib/eal/include/rte_log.h\n@@ -41,7 +41,7 @@ extern \"C\" {\n \t\t\t\t /* was RTE_LOGTYPE_SCHED */\n \t\t\t\t /* was RTE_LOGTYPE_PORT */\n \t\t\t\t /* was RTE_LOGTYPE_TABLE */\n-#define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */\n+\t\t\t\t /* was RTE_LOGTYPE_PIPELINE */\n \t\t\t\t /* was RTE_LOGTYPE_MBUF */\n #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */\n \t\t\t\t /* was RTE_LOGTYPE_EFD */\ndiff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c\nindex ff86c7cf96bf..19597d4e0f1e 100644\n--- a/lib/pipeline/rte_pipeline.c\n+++ b/lib/pipeline/rte_pipeline.c\n@@ -12,6 +12,12 @@\n \n #include \"rte_pipeline.h\"\n \n+RTE_LOG_REGISTER_DEFAULT(pipeline_logtype, INFO);\n+\n+#define PIPELINE_LOG(level, fmt, args...)\t\t\\\n+\trte_log(RTE_LOG_ ## level, pipeline_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ## args)\n+\n #define RTE_TABLE_INVALID UINT32_MAX\n \n #ifdef RTE_PIPELINE_STATS_COLLECT\n@@ -161,23 +167,19 @@ static int\n rte_pipeline_check_params(struct rte_pipeline_params *params)\n {\n \tif (params == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Incorrect value for parameter params\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Incorrect value for parameter params\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* name */\n \tif (params->name == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Incorrect value for parameter name\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Incorrect value for parameter name\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* socket */\n \tif (params->socket_id < 0) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Incorrect value for parameter socket_id\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"Incorrect value for parameter socket_id\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -193,9 +195,8 @@ rte_pipeline_create(struct rte_pipeline_params *params)\n \t/* Check input parameters */\n \tstatus = rte_pipeline_check_params(params);\n \tif (status != 0) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Pipeline params check failed (%d)\\n\",\n-\t\t\t__func__, status);\n+\t\tPIPELINE_LOG(ERR, \"Pipeline params check failed (%d)\",\n+\t\t\t status);\n \t\treturn NULL;\n \t}\n \n@@ -204,8 +205,7 @@ rte_pipeline_create(struct rte_pipeline_params *params)\n \t\t\tRTE_CACHE_LINE_SIZE, params->socket_id);\n \n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Pipeline memory allocation failed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Pipeline memory allocation failed\");\n \t\treturn NULL;\n \t}\n \n@@ -233,8 +233,7 @@ rte_pipeline_free(struct rte_pipeline *p)\n \n \t/* Check input parameters */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: rte_pipeline parameter is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"rte_pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -275,45 +274,37 @@ rte_table_check_params(struct rte_pipeline *p,\n \t\tuint32_t *table_id)\n {\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \tif (params == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"params parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \tif (table_id == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: table_id parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"table_id parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* ops */\n \tif (params->ops == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params->ops is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"params->ops is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_create == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_create function pointer is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_create function pointer is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_lookup == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_lookup function pointer is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_lookup function pointer is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* De we have room for one more table? */\n \tif (p->num_tables == RTE_PIPELINE_TABLE_MAX) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Incorrect value for num_tables parameter\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"Incorrect value for num_tables parameter\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -345,8 +336,7 @@ rte_pipeline_table_create(struct rte_pipeline *p,\n \tdefault_entry = rte_zmalloc_socket(\n \t\t\"PIPELINE\", entry_size, RTE_CACHE_LINE_SIZE, p->socket_id);\n \tif (default_entry == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Failed to allocate default entry\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Failed to allocate default entry\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -355,7 +345,7 @@ rte_pipeline_table_create(struct rte_pipeline *p,\n \t\tentry_size);\n \tif (h_table == NULL) {\n \t\trte_free(default_entry);\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: Table creation failed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Table creation failed\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -401,20 +391,17 @@ rte_pipeline_table_default_entry_add(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (default_entry == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: default_entry parameter is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"default_entry parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -423,8 +410,7 @@ rte_pipeline_table_default_entry_add(struct rte_pipeline *p,\n \tif ((default_entry->action == RTE_PIPELINE_ACTION_TABLE) &&\n \t\ttable->table_next_id_valid &&\n \t\t(default_entry->table_id != table->table_next_id)) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Tree-like topologies not allowed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Tree-like topologies not allowed\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -450,14 +436,12 @@ rte_pipeline_table_default_entry_delete(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: pipeline parameter is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -486,41 +470,36 @@ rte_pipeline_table_entry_add(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (key == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: key parameter is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"key parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (entry == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: entry parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"entry parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n \ttable = &p->tables[table_id];\n \n \tif (table->ops.f_add == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: f_add function pointer NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"f_add function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif ((entry->action == RTE_PIPELINE_ACTION_TABLE) &&\n \t\ttable->table_next_id_valid &&\n \t\t(entry->table_id != table->table_next_id)) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Tree-like topologies not allowed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Tree-like topologies not allowed\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -546,28 +525,24 @@ rte_pipeline_table_entry_delete(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (key == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: key parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"key parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n \ttable = &p->tables[table_id];\n \n \tif (table->ops.f_delete == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_delete function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_delete function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -587,33 +562,29 @@ int rte_pipeline_table_entry_add_bulk(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (keys == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: keys parameter is NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"keys parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (entries == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: entries parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"entries parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n \ttable = &p->tables[table_id];\n \n \tif (table->ops.f_add_bulk == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: f_add_bulk function pointer NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"f_add_bulk function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -621,8 +592,7 @@ int rte_pipeline_table_entry_add_bulk(struct rte_pipeline *p,\n \t\tif ((entries[i]->action == RTE_PIPELINE_ACTION_TABLE) &&\n \t\t\ttable->table_next_id_valid &&\n \t\t\t(entries[i]->table_id != table->table_next_id)) {\n-\t\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\t\"%s: Tree-like topologies not allowed\\n\", __func__);\n+\t\t\tPIPELINE_LOG(ERR, \"Tree-like topologies not allowed\");\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -651,28 +621,24 @@ int rte_pipeline_table_entry_delete_bulk(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (keys == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: key parameter is NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"key parameter is NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: table_id %d out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table_id %d out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n \ttable = &p->tables[table_id];\n \n \tif (table->ops.f_delete_bulk == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_delete function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_delete function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -690,51 +656,44 @@ rte_pipeline_port_in_check_params(struct rte_pipeline *p,\n \t\tuint32_t *port_id)\n {\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \tif (params == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params parameter NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"params parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \tif (port_id == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: port_id parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"port_id parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* ops */\n \tif (params->ops == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params->ops parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"params->ops parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_create == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_create function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_create function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_rx == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: f_rx function pointer NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"f_rx function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* burst_size */\n \tif ((params->burst_size == 0) ||\n \t\t(params->burst_size > RTE_PORT_IN_BURST_SIZE_MAX)) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: invalid value for burst_size\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"invalid value for burst_size\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Do we have room for one more port? */\n \tif (p->num_ports_in == RTE_PIPELINE_PORT_IN_MAX) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: invalid value for num_ports_in\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"invalid value for num_ports_in\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -747,51 +706,44 @@ rte_pipeline_port_out_check_params(struct rte_pipeline *p,\n \t\tuint32_t *port_id)\n {\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params parameter NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"params parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: port_id parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"port_id parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* ops */\n \tif (params->ops == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: params->ops parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"params->ops parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_create == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_create function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_create function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_tx == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_tx function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_tx function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (params->ops->f_tx_bulk == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: f_tx_bulk function pointer NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"f_tx_bulk function pointer NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Do we have room for one more port? */\n \tif (p->num_ports_out == RTE_PIPELINE_PORT_OUT_MAX) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: invalid value for num_ports_out\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"invalid value for num_ports_out\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -819,7 +771,7 @@ rte_pipeline_port_in_create(struct rte_pipeline *p,\n \t/* Create the port */\n \th_port = params->ops->f_create(params->arg_create, p->socket_id);\n \tif (h_port == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: Port creation failed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Port creation failed\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -869,7 +821,7 @@ rte_pipeline_port_out_create(struct rte_pipeline *p,\n \t/* Create the port */\n \th_port = params->ops->f_create(params->arg_create, p->socket_id);\n \tif (h_port == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: Port creation failed\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"Port creation failed\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -904,22 +856,17 @@ rte_pipeline_port_in_connect_to_table(struct rte_pipeline *p,\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id >= p->num_ports_in) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: port IN ID %u is out of range\\n\",\n-\t\t\t__func__, port_id);\n+\t\tPIPELINE_LOG(ERR, \"port IN ID %u is out of range\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: Table ID %u is out of range\\n\",\n-\t\t\t__func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"Table ID %u is out of range\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -938,15 +885,12 @@ rte_pipeline_port_in_enable(struct rte_pipeline *p, uint32_t port_id)\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id >= p->num_ports_in) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: port IN ID %u is out of range\\n\",\n-\t\t\t__func__, port_id);\n+\t\tPIPELINE_LOG(ERR, \"port IN ID %u is out of range\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -985,14 +929,12 @@ rte_pipeline_port_in_disable(struct rte_pipeline *p, uint32_t port_id)\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id >= p->num_ports_in) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: port IN ID %u is out of range\\n\",\n-\t\t\t__func__, port_id);\n+\t\tPIPELINE_LOG(ERR, \"port IN ID %u is out of range\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1039,26 +981,22 @@ rte_pipeline_check(struct rte_pipeline *p)\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \t/* Check that pipeline has at least one input port, one table and one\n \toutput port */\n \tif (p->num_ports_in == 0) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: must have at least 1 input port\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"must have at least 1 input port\");\n \t\treturn -EINVAL;\n \t}\n \tif (p->num_tables == 0) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: must have at least 1 table\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"must have at least 1 table\");\n \t\treturn -EINVAL;\n \t}\n \tif (p->num_ports_out == 0) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: must have at least 1 output port\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"must have at least 1 output port\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -1067,9 +1005,8 @@ rte_pipeline_check(struct rte_pipeline *p)\n \t\tstruct rte_port_in *port_in = &p->ports_in[port_in_id];\n \n \t\tif (port_in->table_id == RTE_TABLE_INVALID) {\n-\t\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\t\"%s: Port IN ID %u is not connected\\n\",\n-\t\t\t\t__func__, port_in_id);\n+\t\t\tPIPELINE_LOG(ERR, \"Port IN ID %u is not connected\",\n+\t\t\t\t port_in_id);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\n@@ -1451,8 +1388,7 @@ rte_pipeline_flush(struct rte_pipeline *p)\n \n \t/* Check input arguments */\n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n@@ -1504,15 +1440,12 @@ int rte_pipeline_port_in_stats_read(struct rte_pipeline *p, uint32_t port_id,\n \tint retval;\n \n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id >= p->num_ports_in) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: port IN ID %u is out of range\\n\",\n-\t\t\t__func__, port_id);\n+\t\tPIPELINE_LOG(ERR, \"port IN ID %u is out of range\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1541,13 +1474,12 @@ int rte_pipeline_port_out_stats_read(struct rte_pipeline *p, uint32_t port_id,\n \tint retval;\n \n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\", __func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (port_id >= p->num_ports_out) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\"%s: port OUT ID %u is out of range\\n\", __func__, port_id);\n+\t\tPIPELINE_LOG(ERR, \"port OUT ID %u is out of range\", port_id);\n \t\treturn -EINVAL;\n \t}\n \n@@ -1575,14 +1507,12 @@ int rte_pipeline_table_stats_read(struct rte_pipeline *p, uint32_t table_id,\n \tint retval;\n \n \tif (p == NULL) {\n-\t\tRTE_LOG(ERR, PIPELINE, \"%s: pipeline parameter NULL\\n\",\n-\t\t\t__func__);\n+\t\tPIPELINE_LOG(ERR, \"pipeline parameter NULL\");\n \t\treturn -EINVAL;\n \t}\n \n \tif (table_id >= p->num_tables) {\n-\t\tRTE_LOG(ERR, PIPELINE,\n-\t\t\t\t\"%s: table %u is out of range\\n\", __func__, table_id);\n+\t\tPIPELINE_LOG(ERR, \"table %u is out of range\\n\", table_id);\n \t\treturn -EINVAL;\n \t}\n \n", "prefixes": [ "v3", "16/16" ] }