Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138944/?format=api
{ "id": 138944, "url": "http://patches.dpdk.org/api/patches/138944/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240327233001.83505-9-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": "<20240327233001.83505-9-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240327233001.83505-9-stephen@networkplumber.org", "date": "2024-03-27T23:28:31", "name": "[v17,08/15] log: move handling of syslog facility out of eal", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c0038d539c0949319672acdc57815043c40841bc", "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/20240327233001.83505-9-stephen@networkplumber.org/mbox/", "series": [ { "id": 31635, "url": "http://patches.dpdk.org/api/series/31635/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31635", "date": "2024-03-27T23:28:23", "name": "Logging unification and improvements", "version": 17, "mbox": "http://patches.dpdk.org/series/31635/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/138944/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/138944/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 831A543D5B;\n\tThu, 28 Mar 2024 00:31:04 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 24E6342D7B;\n\tThu, 28 Mar 2024 00:30:26 +0100 (CET)", "from mail-pl1-f177.google.com (mail-pl1-f177.google.com\n [209.85.214.177])\n by mails.dpdk.org (Postfix) with ESMTP id CD92E41151\n for <dev@dpdk.org>; Thu, 28 Mar 2024 00:30:18 +0100 (CET)", "by mail-pl1-f177.google.com with SMTP id\n d9443c01a7336-1e00d1e13a2so3195435ad.0\n for <dev@dpdk.org>; Wed, 27 Mar 2024 16:30:18 -0700 (PDT)", "from hermes.local (204-195-123-203.wavecable.com. [204.195.123.203])\n by smtp.gmail.com with ESMTPSA id\n n15-20020a170902e54f00b001e0fdc6e4ebsm80772plf.175.2024.03.27.16.30.17\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 27 Mar 2024 16:30:17 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1711582218;\n x=1712187018; darn=dpdk.org;\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=RT6FK6frw1PCVteueJi1ZqrqlTyPs8vb+PKGspmqbu4=;\n b=gdYecNrJ0YuzfvueVEkF4UX8MrjrH4TRrXGEaNdB46ujhn7rdE2wF+8GttvVvGUpfz\n ys2e82uCDY3h246EEYNSPE92mNT3ZZWZzuxRpXDpBL7lcxoXmQnlZiS871cLVlElvsWT\n XWOGvg0TWSa4I8M4ODAaTZaHi6yxWlTH/e913fbJBccdOpCHUGDc2M99Hpc6/qnpS/Zo\n vokZDur4AccONUNvz7c2U6fpxeTBbsV06Ff3c3pkPGnpOmUfW/gXTFVoRMsVrIeHqHOe\n 4uGl8RfbyZC7y9gJkFSrNboA+v4InvpvHTpzgnX0sJxDnSWdycfyzFx4T7Aj3QjEEOrB\n SEOg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1711582218; x=1712187018;\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=RT6FK6frw1PCVteueJi1ZqrqlTyPs8vb+PKGspmqbu4=;\n b=AsQZc8dvcOxMN/pu0pwGUjbjqYJJMw0r/rqi70KGWcjvttAwcEGnjTjstrdGorgrIj\n WDxWiAM3jaouVtMt8g5mZWg2ypg2J/EFxmx3URaK/0Nnvv9VY5MUXGCgOhpye1+KCkvi\n MI0XJ0c2CsJ/P4YVtlCNasIWsCNp2eDC9XFnKN8AqVmcl1JhvDtSqQeKpG+5A6mpAmyW\n VUNlzINb27okpe/WRUmY2oWqjv/UIyzxF6Zs3kFXMBJ1icBLmohKOba8e1NtuS/QHIhv\n WTPcX9qzxQ61wif3mp0WaoHgjqPh4Y1cud8RmyO8PS3cGWhWljyh9Ci86n2Dh7Kk4z1s\n vjfw==", "X-Gm-Message-State": "AOJu0YyueA1rMeZtMg4i+E9NV0E0UsUuICScQzZ/Q022aLi6DiUBvY1N\n rRtT/8FtHfgt6rZ6p4nGepn4UkYd7/ZklkkykSYgn882DDmbWMrUcuyQ7eyy3l4LVXbTVLr93nA\n F", "X-Google-Smtp-Source": "\n AGHT+IEVCoNgq8RZRELAhbX1T4En7CR6BbWcCYc+kvUcU1q95CkB6FeP+28T0ou3UE9eD3XPZnyKhQ==", "X-Received": "by 2002:a17:902:7041:b0:1e0:a615:c33 with SMTP id\n h1-20020a170902704100b001e0a6150c33mr1047535plt.67.1711582218042;\n Wed, 27 Mar 2024 16:30:18 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>,\n Pallavi Kadam <pallavi.kadam@intel.com>", "Subject": "[PATCH v17 08/15] log: move handling of syslog facility out of eal", "Date": "Wed, 27 Mar 2024 16:28:31 -0700", "Message-ID": "<20240327233001.83505-9-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240327233001.83505-1-stephen@networkplumber.org>", "References": "<20200814173441.23086-1-stephen@networkplumber.org>\n <20240327233001.83505-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": "The syslog facility property is better handled in lib/log\nrather than in eal. This also allows for changes to what\nsyslog flag means in later steps.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/eal/common/eal_common_options.c | 51 ++---------------------------\n lib/eal/freebsd/eal.c | 5 ++-\n lib/eal/linux/eal.c | 7 ++--\n lib/eal/windows/eal.c | 6 ++--\n lib/log/log_freebsd.c | 2 +-\n lib/log/log_internal.h | 5 ++-\n lib/log/log_linux.c | 47 ++++++++++++++++++++++++--\n lib/log/log_windows.c | 8 ++++-\n lib/log/version.map | 1 +\n 9 files changed, 68 insertions(+), 64 deletions(-)", "diff": "diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c\nindex 5435399b85..661b2db211 100644\n--- a/lib/eal/common/eal_common_options.c\n+++ b/lib/eal/common/eal_common_options.c\n@@ -6,9 +6,6 @@\n #include <stdlib.h>\n #include <string.h>\n #include <pthread.h>\n-#ifndef RTE_EXEC_ENV_WINDOWS\n-#include <syslog.h>\n-#endif\n #include <ctype.h>\n #include <limits.h>\n #include <errno.h>\n@@ -349,10 +346,6 @@ eal_reset_internal_config(struct internal_config *internal_cfg)\n \t}\n \tinternal_cfg->base_virtaddr = 0;\n \n-#ifdef LOG_DAEMON\n-\tinternal_cfg->syslog_facility = LOG_DAEMON;\n-#endif\n-\n \t/* if set to NONE, interrupt mode is determined automatically */\n \tinternal_cfg->vfio_intr_mode = RTE_INTR_MODE_NONE;\n \tmemset(internal_cfg->vfio_vf_token, 0,\n@@ -1297,47 +1290,6 @@ eal_parse_lcores(const char *lcores)\n \treturn ret;\n }\n \n-#ifndef RTE_EXEC_ENV_WINDOWS\n-static int\n-eal_parse_syslog(const char *facility, struct internal_config *conf)\n-{\n-\tint i;\n-\tstatic const struct {\n-\t\tconst char *name;\n-\t\tint value;\n-\t} map[] = {\n-\t\t{ \"auth\", LOG_AUTH },\n-\t\t{ \"cron\", LOG_CRON },\n-\t\t{ \"daemon\", LOG_DAEMON },\n-\t\t{ \"ftp\", LOG_FTP },\n-\t\t{ \"kern\", LOG_KERN },\n-\t\t{ \"lpr\", LOG_LPR },\n-\t\t{ \"mail\", LOG_MAIL },\n-\t\t{ \"news\", LOG_NEWS },\n-\t\t{ \"syslog\", LOG_SYSLOG },\n-\t\t{ \"user\", LOG_USER },\n-\t\t{ \"uucp\", LOG_UUCP },\n-\t\t{ \"local0\", LOG_LOCAL0 },\n-\t\t{ \"local1\", LOG_LOCAL1 },\n-\t\t{ \"local2\", LOG_LOCAL2 },\n-\t\t{ \"local3\", LOG_LOCAL3 },\n-\t\t{ \"local4\", LOG_LOCAL4 },\n-\t\t{ \"local5\", LOG_LOCAL5 },\n-\t\t{ \"local6\", LOG_LOCAL6 },\n-\t\t{ \"local7\", LOG_LOCAL7 },\n-\t\t{ NULL, 0 }\n-\t};\n-\n-\tfor (i = 0; map[i].name; i++) {\n-\t\tif (!strcmp(facility, map[i].name)) {\n-\t\t\tconf->syslog_facility = map[i].value;\n-\t\t\treturn 0;\n-\t\t}\n-\t}\n-\treturn -1;\n-}\n-#endif\n-\n static void\n eal_log_usage(void)\n {\n@@ -1663,6 +1615,7 @@ eal_log_level_parse(int argc, char * const argv[])\n \n \t\tswitch (opt) {\n \t\tcase OPT_LOG_LEVEL_NUM:\n+\t\tcase OPT_SYSLOG_NUM:\n \t\t\tif (eal_parse_common_option(opt, optarg, internal_conf) < 0)\n \t\t\t\treturn -1;\n \t\t\tbreak;\n@@ -1882,7 +1835,7 @@ eal_parse_common_option(int opt, const char *optarg,\n \n #ifndef RTE_EXEC_ENV_WINDOWS\n \tcase OPT_SYSLOG_NUM:\n-\t\tif (eal_parse_syslog(optarg, conf) < 0) {\n+\t\tif (eal_log_syslog(optarg) < 0) {\n \t\t\tEAL_LOG(ERR, \"invalid parameters for --\"\n \t\t\t\t\tOPT_SYSLOG);\n \t\t\treturn -1;\ndiff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c\nindex 17b56f38aa..6552f9c138 100644\n--- a/lib/eal/freebsd/eal.c\n+++ b/lib/eal/freebsd/eal.c\n@@ -11,7 +11,6 @@\n #include <stdarg.h>\n #include <unistd.h>\n #include <pthread.h>\n-#include <syslog.h>\n #include <getopt.h>\n #include <sys/file.h>\n #include <stddef.h>\n@@ -392,8 +391,8 @@ eal_parse_args(int argc, char **argv)\n \t\t\tgoto out;\n \t\t}\n \n-\t\t/* eal_log_level_parse() already handled this option */\n-\t\tif (opt == OPT_LOG_LEVEL_NUM)\n+\t\t/* eal_log_level_parse() already handled these */\n+\t\tif (opt == OPT_LOG_LEVEL_NUM || opt == OPT_LOG_SYSLOG_NUM)\n \t\t\tcontinue;\n \n \t\tret = eal_parse_common_option(opt, optarg, internal_conf);\ndiff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c\nindex 23dc26b124..3d0c34063e 100644\n--- a/lib/eal/linux/eal.c\n+++ b/lib/eal/linux/eal.c\n@@ -610,8 +610,8 @@ eal_parse_args(int argc, char **argv)\n \t\t\tgoto out;\n \t\t}\n \n-\t\t/* eal_log_level_parse() already handled this option */\n-\t\tif (opt == OPT_LOG_LEVEL_NUM)\n+\t\t/* eal_log_level_parse() already handled these options */\n+\t\tif (opt == OPT_LOG_LEVEL_NUM || opt == OPT_SYSLOG_NUM)\n \t\t\tcontinue;\n \n \t\tret = eal_parse_common_option(opt, optarg, internal_conf);\n@@ -1106,8 +1106,7 @@ rte_eal_init(int argc, char **argv)\n #endif\n \t}\n \n-\tif (eal_log_init(program_invocation_short_name,\n-\t\t\t internal_conf->syslog_facility) < 0) {\n+\tif (eal_log_init(program_invocation_short_name) < 0) {\n \t\trte_eal_init_alert(\"Cannot init logging.\");\n \t\trte_errno = ENOMEM;\n \t\trte_atomic_store_explicit(&run_once, 0, rte_memory_order_relaxed);\ndiff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c\nindex 44e20643f2..14e498a643 100644\n--- a/lib/eal/windows/eal.c\n+++ b/lib/eal/windows/eal.c\n@@ -120,8 +120,8 @@ eal_parse_args(int argc, char **argv)\n \t\t\treturn -1;\n \t\t}\n \n-\t\t/* eal_log_level_parse() already handled this option */\n-\t\tif (opt == OPT_LOG_LEVEL_NUM)\n+\t\t/* eal_log_level_parse() already handled these options */\n+\t\tif (opt == OPT_LOG_LEVEL_NUM || opt == OPT_SYSLOG_NUM)\n \t\t\tcontinue;\n \n \t\tret = eal_parse_common_option(opt, optarg, internal_conf);\n@@ -250,7 +250,7 @@ rte_eal_init(int argc, char **argv)\n \tchar cpuset[RTE_CPU_AFFINITY_STR_LEN];\n \tchar thread_name[RTE_THREAD_NAME_SIZE];\n \n-\teal_log_init(NULL, 0);\n+\teal_log_init(NULL);\n \n \teal_log_level_parse(argc, argv);\n \ndiff --git a/lib/log/log_freebsd.c b/lib/log/log_freebsd.c\nindex 698d3c5423..953e371bee 100644\n--- a/lib/log/log_freebsd.c\n+++ b/lib/log/log_freebsd.c\n@@ -6,7 +6,7 @@\n #include \"log_internal.h\"\n \n int\n-eal_log_init(__rte_unused const char *id, __rte_unused int facility)\n+eal_log_init(__rte_unused const char *id)\n {\n \treturn 0;\n }\ndiff --git a/lib/log/log_internal.h b/lib/log/log_internal.h\nindex 451629f1c1..cb15cdff08 100644\n--- a/lib/log/log_internal.h\n+++ b/lib/log/log_internal.h\n@@ -14,7 +14,7 @@\n * Initialize the default log stream.\n */\n __rte_internal\n-int eal_log_init(const char *id, int facility);\n+int eal_log_init(const char *id);\n \n /*\n * Determine where log data is written when no call to rte_openlog_stream.\n@@ -30,6 +30,9 @@ int eal_log_save_regexp(const char *regexp, uint32_t level);\n __rte_internal\n int eal_log_save_pattern(const char *pattern, uint32_t level);\n \n+__rte_internal\n+int eal_log_syslog(const char *name);\n+\n /*\n * Convert log level to string.\n */\ndiff --git a/lib/log/log_linux.c b/lib/log/log_linux.c\nindex 2dfb0c974b..47aa074da2 100644\n--- a/lib/log/log_linux.c\n+++ b/lib/log/log_linux.c\n@@ -3,13 +3,56 @@\n */\n \n #include <stdio.h>\n+#include <string.h>\n #include <sys/types.h>\n #include <syslog.h>\n \n+#include <rte_common.h>\n #include <rte_log.h>\n \n #include \"log_internal.h\"\n \n+static int log_facility = LOG_DAEMON;\n+\n+static const struct {\n+\tconst char *name;\n+\tint value;\n+} facilitys[] = {\n+\t{ \"auth\", LOG_AUTH },\n+\t{ \"cron\", LOG_CRON },\n+\t{ \"daemon\", LOG_DAEMON },\n+\t{ \"ftp\", LOG_FTP },\n+\t{ \"kern\", LOG_KERN },\n+\t{ \"lpr\", LOG_LPR },\n+\t{ \"mail\", LOG_MAIL },\n+\t{ \"news\", LOG_NEWS },\n+\t{ \"syslog\", LOG_SYSLOG },\n+\t{ \"user\", LOG_USER },\n+\t{ \"uucp\", LOG_UUCP },\n+\t{ \"local0\", LOG_LOCAL0 },\n+\t{ \"local1\", LOG_LOCAL1 },\n+\t{ \"local2\", LOG_LOCAL2 },\n+\t{ \"local3\", LOG_LOCAL3 },\n+\t{ \"local4\", LOG_LOCAL4 },\n+\t{ \"local5\", LOG_LOCAL5 },\n+\t{ \"local6\", LOG_LOCAL6 },\n+\t{ \"local7\", LOG_LOCAL7 },\n+};\n+\n+int\n+eal_log_syslog(const char *name)\n+{\n+\tunsigned int i;\n+\n+\tfor (i = 0; i < RTE_DIM(facilitys); i++) {\n+\t\tif (!strcmp(name, facilitys[i].name)) {\n+\t\t\tlog_facility = facilitys[i].value;\n+\t\t\treturn 0;\n+\t\t}\n+\t}\n+\treturn -1;\n+}\n+\n /*\n * default log function\n */\n@@ -45,7 +88,7 @@ static cookie_io_functions_t console_log_func = {\n * once memzones are available.\n */\n int\n-eal_log_init(const char *id, int facility)\n+eal_log_init(const char *id)\n {\n \tFILE *log_stream;\n \n@@ -53,7 +96,7 @@ eal_log_init(const char *id, int facility)\n \tif (log_stream == NULL)\n \t\treturn -1;\n \n-\topenlog(id, LOG_NDELAY | LOG_PID, facility);\n+\topenlog(id, LOG_NDELAY | LOG_PID, log_facility);\n \n \teal_log_set_default(log_stream);\n \ndiff --git a/lib/log/log_windows.c b/lib/log/log_windows.c\nindex a6a0889550..a3a756351d 100644\n--- a/lib/log/log_windows.c\n+++ b/lib/log/log_windows.c\n@@ -6,9 +6,15 @@\n #include <rte_log.h>\n #include \"log_internal.h\"\n \n+int\n+eal_log_syslog(const char *name __rte_unused)\n+{\n+\treturn -1; /* not used */\n+}\n+\n /* set the log to default function, called during eal init process. */\n int\n-eal_log_init(__rte_unused const char *id, __rte_unused int facility)\n+eal_log_init(__rte_unused const char *id)\n {\n \trte_openlog_stream(stderr);\n \ndiff --git a/lib/log/version.map b/lib/log/version.map\nindex 0648f8831a..9c6c49bf06 100644\n--- a/lib/log/version.map\n+++ b/lib/log/version.map\n@@ -30,5 +30,6 @@ INTERNAL {\n \teal_log_save_pattern;\n \teal_log_save_regexp;\n \teal_log_set_default;\n+\teal_log_syslog;\n \trte_eal_log_cleanup;\n };\n", "prefixes": [ "v17", "08/15" ] }