From: Tomas Jedlicka Date: Thu, 9 Mar 2017 22:44:51 +0000 (-0500) Subject: DTrace walltime lock-free implementation X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~20 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=69930f64b1078c765e0032da3242539abe101693;p=users%2Fjedix%2Flinux-maple.git DTrace walltime lock-free implementation The DIF_VAR_WALLTIMESTAMP now uses new dtrace_get_walltimestamp(). Orabug: 25715256 Signed-off-by: Tomas Jedlicka Reviewed-by: Nick Alcock --- diff --git a/dtrace/dtrace_dif.c b/dtrace/dtrace_dif.c index 96598797f9966..bfa3e124747d2 100644 --- a/dtrace/dtrace_dif.c +++ b/dtrace/dtrace_dif.c @@ -21,8 +21,7 @@ * * CDDL HEADER END * - * Copyright 2010-2017 Oracle, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. */ #include @@ -2080,7 +2079,6 @@ static uint64_t dtrace_dif_variable(dtrace_mstate_t *mstate, return (uint64_t)(uintptr_t)current; case DIF_VAR_TIMESTAMP: - case DIF_VAR_WALLTIMESTAMP: if (!(mstate->dtms_present & DTRACE_MSTATE_TIMESTAMP)) { mstate->dtms_timestamp = current->dtrace_start; mstate->dtms_present |= DTRACE_MSTATE_TIMESTAMP; @@ -2088,6 +2086,9 @@ static uint64_t dtrace_dif_variable(dtrace_mstate_t *mstate, return ktime_to_ns(mstate->dtms_timestamp); + case DIF_VAR_WALLTIMESTAMP: + return ktime_to_ns(dtrace_get_walltime()); + case DIF_VAR_VTIMESTAMP: ASSERT(dtrace_vtime_references != 0);