Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/75565/?format=api
{ "id": 75565, "url": "https://patches.dpdk.org/api/patches/75565/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200814173441.23086-1-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://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": "<20200814173441.23086-1-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20200814173441.23086-1-stephen@networkplumber.org", "date": "2020-08-14T17:34:41", "name": "eal: add option to put timestamp on console output", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "1b0ee58e993cdf6be2ca50c584f28cb20185ecd5", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200814173441.23086-1-stephen@networkplumber.org/mbox/", "series": [ { "id": 11658, "url": "https://patches.dpdk.org/api/series/11658/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=11658", "date": "2020-08-14T17:34:41", "name": "eal: add option to put timestamp on console output", "version": 1, "mbox": "https://patches.dpdk.org/series/11658/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/75565/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/75565/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 457C8A04B0;\n\tFri, 14 Aug 2020 19:34:54 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7CACF1C0CD;\n\tFri, 14 Aug 2020 19:34:53 +0200 (CEST)", "from mail-pg1-f196.google.com (mail-pg1-f196.google.com\n [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 5FD151C0C0\n for <dev@dpdk.org>; Fri, 14 Aug 2020 19:34:52 +0200 (CEST)", "by mail-pg1-f196.google.com with SMTP id 189so4217015pgg.13\n for <dev@dpdk.org>; Fri, 14 Aug 2020 10:34:52 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n by smtp.gmail.com with ESMTPSA id v2sm8949236pjd.18.2020.08.14.10.34.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 14 Aug 2020 10:34:50 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=75/RxtbuPmNwggjYKosjs3q1lkkYVRP7mTo6krEwNhw=;\n b=lxduagCHh2sIIcXXrQvWW6NMUEu2B5fwtISdHTzNs4WCP2W+WCBNF4pV+G+6x+Dk5w\n ZboSaMFA9aXik2QovCfx2a1Vb2BCQKdtRomrezXzJZhGeNEHILjwciQ1zv2spjD2LJcs\n c2rJWCHD9BZjQGaZViOTGFfTpWQZGTkB6FfUds2f0RH+dupVk50KRbgaosp/VW6exymd\n XQLsUMWkh6b2KQE8ofDJJC+Ksjhgh3NHdZUenVIYWD0evG8opCfiVcSWGG2fcJ4cPjAF\n lY1R7WlkkayoFeX0PQWqHv/nSsaGE6T9eqHpANqxa9Xlp3PFVams/i+CqvRWqg6nNam2\n G1/w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=75/RxtbuPmNwggjYKosjs3q1lkkYVRP7mTo6krEwNhw=;\n b=p7yXDopiHB6a2Qefi2Hif+DzglCJR5vBL+648Wp8uw82XllgghXlTMTtjRcPxcp6Ol\n qPyMG0M+QFZ3N9fDDzAs8cVlKe/Qnw2TyVsLJNF2VpM/pljzW/YcET72FTsBSDEBYkeI\n gaIh5tIvvbpLJtiEStlkawiLKnfFG3jClCE009kJXfiyCJ16vzicjMAkdJvQl/2DdVne\n sefq7R4rnBsSLkEtDm1UgWJuEba6PgLUWNgaOOQaa66hePrbO29KVTzr45s0ojtSIFQG\n s0+YbeoLEPgpTcZJq3dR+0cyeCGKjEOepO9bK7YF5RGpCFQufYlE3AMcHvq3iI8qhdsR\n M5CQ==", "X-Gm-Message-State": "AOAM531uMzgTntp0DTLczpfz+CP00BBW2RGAJ1xOtlzZPVdf6vBfVxqh\n +tyF3s+E85qwe6SIzrbbYTACHeiRf/y85w==", "X-Google-Smtp-Source": "\n ABdhPJyTlC3jYagI7AUTYADDMzn2ugAjnnvpg/80QvAK7UX89Z/4OW2i8TrH5+zYTbXS4BBZKNM2yA==", "X-Received": "by 2002:a62:19d4:: with SMTP id 203mr2499880pfz.127.1597426490887;\n Fri, 14 Aug 2020 10:34:50 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Date": "Fri, 14 Aug 2020 10:34:41 -0700", "Message-Id": "<20200814173441.23086-1-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] eal: add option to put timestamp on console\n\toutput", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "When debugging driver or startup issues, it is useful to have\na timestamp on each message printed. The messages in syslog\nalready have a timestamp, but often syslog is not available\nduring testing. The timestamp format is chosen to look\nlike the default Linux dmesg timestamp.\n\nExample:\n[ 0.000040] EAL: Probing VFIO support...\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n doc/guides/linux_gsg/linux_eal_parameters.rst | 5 +++\n lib/librte_eal/common/eal_common_options.c | 5 +++\n lib/librte_eal/common/eal_internal_cfg.h | 1 +\n lib/librte_eal/common/eal_options.h | 2 +\n lib/librte_eal/linux/eal_log.c | 41 +++++++++++++++++--\n 5 files changed, 51 insertions(+), 3 deletions(-)", "diff": "diff --git a/doc/guides/linux_gsg/linux_eal_parameters.rst b/doc/guides/linux_gsg/linux_eal_parameters.rst\nindex bd3977cb3d91..9336046c63a9 100644\n--- a/doc/guides/linux_gsg/linux_eal_parameters.rst\n+++ b/doc/guides/linux_gsg/linux_eal_parameters.rst\n@@ -118,3 +118,8 @@ Other options\n local5\n local6\n local7\n+\n+* ``--log-timestamp``\n+\n+ Add a timestamp of seconds and microseconds to each log message\n+ written to standard output.\ndiff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex a5426e12346a..240610770ee1 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -76,6 +76,7 @@ eal_long_options[] = {\n \t{OPT_IOVA_MODE,\t 1, NULL, OPT_IOVA_MODE_NUM },\n \t{OPT_LCORES, 1, NULL, OPT_LCORES_NUM },\n \t{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM },\n+\t{OPT_LOG_TIMESTAMP, 0, NULL, OPT_LOG_TIMESTAMP_NUM },\n \t{OPT_TRACE, 1, NULL, OPT_TRACE_NUM },\n \t{OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM },\n \t{OPT_TRACE_BUF_SIZE, 1, NULL, OPT_TRACE_BUF_SIZE_NUM },\n@@ -1626,6 +1627,9 @@ eal_parse_common_option(int opt, const char *optarg,\n \t\t}\n \t\tbreak;\n \t}\n+\tcase OPT_LOG_TIMESTAMP_NUM:\n+\t\tconf->log_timestamp = 1;\n+\t\tbreak;\n \n #ifndef RTE_EXEC_ENV_WINDOWS\n \tcase OPT_TRACE_NUM: {\n@@ -1945,6 +1949,7 @@ eal_common_usage(void)\n \t \" --\"OPT_PROC_TYPE\" Type of this process (primary|secondary|auto)\\n\"\n #ifndef RTE_EXEC_ENV_WINDOWS\n \t \" --\"OPT_SYSLOG\" Set syslog facility\\n\"\n+\t \" --\"OPT_LOG_TIMESTAMP\" Timestamp log output\\n\"\n #endif\n \t \" --\"OPT_LOG_LEVEL\"=<int> Set global log level\\n\"\n \t \" --\"OPT_LOG_LEVEL\"=<type-match>:<int>\\n\"\ndiff --git a/lib/librte_eal/common/eal_internal_cfg.h b/lib/librte_eal/common/eal_internal_cfg.h\nindex 13f93388a781..75c476870c57 100644\n--- a/lib/librte_eal/common/eal_internal_cfg.h\n+++ b/lib/librte_eal/common/eal_internal_cfg.h\n@@ -70,6 +70,7 @@ struct internal_config {\n \t * per-node) non-legacy mode only.\n \t */\n \tvolatile int syslog_facility;\t /**< facility passed to openlog() */\n+\tvolatile uint8_t log_timestamp; /**< add timestamp to console output */\n \t/** default interrupt mode for VFIO */\n \tvolatile enum rte_intr_mode vfio_intr_mode;\n \t/** the shared VF token for VFIO-PCI bound PF and VFs devices */\ndiff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h\nindex 89769d48b487..7c86f2e19109 100644\n--- a/lib/librte_eal/common/eal_options.h\n+++ b/lib/librte_eal/common/eal_options.h\n@@ -35,6 +35,8 @@ enum {\n \tOPT_LCORES_NUM,\n #define OPT_LOG_LEVEL \"log-level\"\n \tOPT_LOG_LEVEL_NUM,\n+#define OPT_LOG_TIMESTAMP \"log-timestamp\"\n+\tOPT_LOG_TIMESTAMP_NUM,\n #define OPT_TRACE \"trace\"\n \tOPT_TRACE_NUM,\n #define OPT_TRACE_DIR \"trace-dir\"\ndiff --git a/lib/librte_eal/linux/eal_log.c b/lib/librte_eal/linux/eal_log.c\nindex 43c8460bfb07..cbd0924ec847 100644\n--- a/lib/librte_eal/linux/eal_log.c\n+++ b/lib/librte_eal/linux/eal_log.c\n@@ -5,9 +5,12 @@\n #include <string.h>\n #include <stdio.h>\n #include <stdint.h>\n+#include <unistd.h>\n+#include <time.h>\n #include <sys/types.h>\n #include <syslog.h>\n #include <sys/queue.h>\n+#include <sys/uio.h>\n \n #include <rte_memory.h>\n #include <rte_eal.h>\n@@ -18,6 +21,9 @@\n #include <rte_log.h>\n \n #include \"eal_private.h\"\n+#include \"eal_internal_cfg.h\"\n+\n+static struct timespec log_start_time;\n \n /*\n * default log function\n@@ -25,11 +31,38 @@\n static ssize_t\n console_log_write(__rte_unused void *c, const char *buf, size_t size)\n {\n+\tconst struct internal_config *internal_conf\n+\t\t= eal_get_internal_configuration();\n \tssize_t ret;\n+\tchar tbuf[64];\n+\tstruct iovec iov[2];\n+\n+\tif (internal_conf->log_timestamp) {\n+\t\tstruct timespec ts;\n+\n+\t\t/* format up monotonic timestamp */\n+\t\tclock_gettime(CLOCK_MONOTONIC, &ts);\n+\t\tts.tv_sec -= log_start_time.tv_sec;\n+\t\tts.tv_nsec -= log_start_time.tv_nsec;\n+\t\tif (ts.tv_nsec < 0) {\n+\t\t\t--ts.tv_sec;\n+\t\t\tts.tv_nsec += 1000000000ul;\n+\t\t}\n \n-\t/* write on stdout */\n-\tret = fwrite(buf, 1, size, stdout);\n-\tfflush(stdout);\n+\t\tiov[0].iov_base = tbuf;\n+\t\tiov[0].iov_len = snprintf(tbuf, sizeof(tbuf), \"[%8lu.%06lu] \",\n+\t\t\t\t\t ts.tv_sec, ts.tv_nsec / 1000u);\n+\n+\t\t/* extra cast is workaround to remove const quallifier */\n+\t\tiov[1].iov_base = (void *)(uintptr_t)buf;\n+\t\tiov[1].iov_len = size;\n+\n+\t\tfflush(stdout);\n+\t\tret = writev(STDOUT_FILENO, iov, 2);\n+\t} else {\n+\t\t/* write on stdout */\n+\t\tret = fwrite(buf, 1, size, stdout);\n+\t}\n \n \t/* Syslog error levels are from 0 to 7, so subtract 1 to convert */\n \tsyslog(rte_log_cur_msg_loglevel() - 1, \"%.*s\", (int)size, buf);\n@@ -50,6 +83,8 @@ rte_eal_log_init(const char *id, int facility)\n {\n \tFILE *log_stream;\n \n+\tclock_gettime(CLOCK_MONOTONIC, &log_start_time);\n+\n \tlog_stream = fopencookie(NULL, \"w+\", console_log_func);\n \tif (log_stream == NULL)\n \t\treturn -1;\n", "prefixes": [] }