From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 5/5] [RFC] Traditional console timestamps including milliseconds Date: Fri, 28 Feb 2014 18:57:04 +0000 Message-ID: <1393613824-13230-6-git-send-email-andrew.cooper3@citrix.com> References: <1393613824-13230-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1393613824-13230-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper List-Id: xen-devel@lists.xenproject.org Suggested-by: Don Slutz Signed-off-by: Andrew Cooper --- xen/arch/x86/time.c | 10 +++++++--- xen/drivers/char/console.c | 11 ++++++++++- xen/include/asm-x86/time.h | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 3da4def..884a522 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1648,15 +1648,19 @@ int dom0_pit_access(struct ioreq *ioreq) return 0; } -struct tm wallclock_time(void) +struct tm wallclock_time(uint64_t *ns) { - uint64_t seconds; + uint64_t seconds, nsec; if ( !wc_sec ) return (struct tm) { 0 }; seconds = NOW() + (wc_sec * 1000000000ull) + wc_nsec; - do_div(seconds, 1000000000); + nsec = do_div(seconds, 1000000000); + + if ( *ns ) + *ns = nsec; + return gmtime(seconds); } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 652d02d..02f6599 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -53,6 +53,7 @@ enum con_timestamp_mode { TSM_NONE, /* No timestamps */ TSM_DATE, /* [YYYY-MM-DD HH:MM:SS] */ + TSM_DATE_MS, /* [YYYY-MM-DD HH:MM:SS.mmmmmm] */ TSM_SINCE_BOOT /* [SSSSSS.mmmmmm] */ }; @@ -560,6 +561,8 @@ static void __init parse_console_timestamps(char *s) if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) opt_con_timestamp_mode = TSM_DATE; + else if ( !strcmp(s, "datems") ) + opt_con_timestamp_mode = TSM_DATE_MS; else if ( !strcmp(s, "boot") ) opt_con_timestamp_mode = TSM_SINCE_BOOT; else if ( !strcmp(s, "none") ) @@ -579,7 +582,8 @@ static void printk_start_of_line(const char *prefix) switch ( opt_con_timestamp_mode ) { case TSM_DATE: - tm = wallclock_time(); + case TSM_DATE_MS: + tm = wallclock_time(&nsec); if ( tm.tm_mday == 0 ) return; @@ -588,6 +592,11 @@ static void printk_start_of_line(const char *prefix) snprintf(tstr, sizeof(tstr), "[%04u-%02u-%02u %02u:%02u:%02u] ", 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + else + snprintf(tstr, sizeof(tstr), + "[%04u-%02u-%02u %02u:%02u:%02u.%06"PRIu64"] ", + 1900 + tm.tm_year, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, nsec / 1000); break; case TSM_SINCE_BOOT: diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h index 147b39e..2f9dbd1 100644 --- a/xen/include/asm-x86/time.h +++ b/xen/include/asm-x86/time.h @@ -49,7 +49,7 @@ int dom0_pit_access(struct ioreq *ioreq); int cpu_frequency_change(u64 freq); struct tm; -struct tm wallclock_time(void); +struct tm wallclock_time(uint64_t *ns); void pit_broadcast_enter(void); void pit_broadcast_exit(void); -- 1.7.10.4