From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 367D6C43215 for ; Tue, 3 Dec 2019 10:35:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BD5D2080A for ; Tue, 3 Dec 2019 10:35:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BaPGGZFk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726098AbfLCKfj (ORCPT ); Tue, 3 Dec 2019 05:35:39 -0500 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35941 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726057AbfLCKfj (ORCPT ); Tue, 3 Dec 2019 05:35:39 -0500 Received: by mail-lj1-f196.google.com with SMTP id r19so3211132ljg.3 for ; Tue, 03 Dec 2019 02:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K8ZZRaXB75jmADvYv/7v8U9DJpWLr4FMA5xXySBgHmY=; b=BaPGGZFk5zUBQSzd5PshWr3VZf2dME9eIGpFVlsWSEqcOqCb6AzA7hOKV47l55NaMB w2PoAXgv3+65v3lvjLHOiPQWZH0/83P45O3Pbkq8EQivQRYnX7OqzoryJFADHLfmS+DY p50HEWCmYs213dmFvCaEKHZfq94XnbmObaKcX8qbPPfuLR5EbmO4mQcPzCQekfeCo1Kn F6hyMmAOt+aN4GuKtVjxusvOchJCKjS5xqPjFr8xIwV8ca4c4u3Q6G8BfvU/1ViZr+XZ 9Ga+HJnc4UsPi7DNgZzAOCrUmA8wp6S3d7VQx8gyS+VByoezBAqP6t39eoWnxb4eno/k Ix9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K8ZZRaXB75jmADvYv/7v8U9DJpWLr4FMA5xXySBgHmY=; b=Y+tj5q9LRsl0tZtweyZ7v24QoLkF8A5PY9+4fZJj5t26Tr/nG1+Nrt64jgjnkc0/hv pEK23He4IWK6NvrKKJ1OQ0REPZ7kseGg/AJDoaRTgt0eU1tYSicuxcjs8cwJ9NOns6ZI DqLu8KJ7wxSQyFjTURDmDM1lmjnVNDQjfT2MhnknTK2pmXEiFS8QuCNJR+3q2WfYqwnz zNDVIbSywD1feEwwurDDBCiQ0rB2yA00LV2uI5nCgBTVXtAu5XZ7+fFeffabGi1Lij0y J/XAKG3BnThE27tVzKuUYAioZKSFyeoufxmCCiUVeLfaGiJEXI9NLZyDliU6xLYjyHj/ gjkQ== X-Gm-Message-State: APjAAAUjIgxTfEfmGDCIvlXJC0dvNTkym+ea8vXgnEA7CA12QJ8eBOA0 0JjO5wUoYAZU1F/SGwtj+xE= X-Google-Smtp-Source: APXvYqyblYqPNiJ37yLTjVh+q81Q/AqRZ2jybQ6XMsoHu3TnkdrOjdZ+dtoM0k7xXXPzK4oD6mHcVg== X-Received: by 2002:a2e:8606:: with SMTP id a6mr1346712lji.119.1575369337346; Tue, 03 Dec 2019 02:35:37 -0800 (PST) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id t9sm1053023lfl.51.2019.12.03.02.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 02:35:36 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v17 09/18] trace-cmd: Add new API to generate a unique ID of the tracing session Date: Tue, 3 Dec 2019 12:35:13 +0200 Message-Id: <20191203103522.482684-10-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191203103522.482684-1-tz.stoyanov@gmail.com> References: <20191203103522.482684-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org A new libtracecmd API is implemented: unsigned long long tracecmd_generate_traceid(void); At trace-cmd init phase a unique ID, used for the current tracing session. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/trace-cmd/trace-cmd.h | 1 + lib/trace-cmd/trace-util.c | 31 +++++++++++++++++++++++++++++++ tracecmd/include/trace-local.h | 1 + tracecmd/trace-record.c | 1 + 4 files changed, 34 insertions(+) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 47fa463..6d50b08 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -441,6 +441,7 @@ void tracecmd_plog_error(const char *fmt, ...); int tracecmd_set_logfile(char *logfile); /* --- System --- */ +unsigned long long tracecmd_generate_traceid(void); int tracecmd_count_cpus(void); /* --- Hack! --- */ diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c index a54a905..2231eb8 100644 --- a/lib/trace-cmd/trace-util.c +++ b/lib/trace-cmd/trace-util.c @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "trace-cmd.h" #include "event-utils.h" @@ -1299,3 +1301,32 @@ error: tracecmd_put_tracing_file(path); return ret; } + +#define FNV_64_PRIME 0x100000001b3ULL +unsigned long long tracecmd_generate_traceid(void) +{ + unsigned long long hash = 0; + unsigned char *ustr; + struct sysinfo sinfo; + struct timespec ts; + char *str = NULL; + + clock_gettime(CLOCK_MONOTONIC_RAW, &ts); + sysinfo(&sinfo); + asprintf(&str, "%ld %ld %ld %ld %ld %ld %ld %ld %d", + ts.tv_sec, ts.tv_nsec, + sinfo.loads[0], sinfo.loads[1], sinfo.loads[2], + sinfo.freeram, sinfo.sharedram, sinfo.freeswap, + sinfo.procs); + if (!str) + return 0; + ustr = (unsigned char *)str; + hash = 0; + while (*ustr) { + hash ^= (unsigned long long)*ustr++; + hash *= FNV_64_PRIME; + } + + free(str); + return hash; +} diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h index 51abef1..6203e0d 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -182,6 +182,7 @@ struct pid_addr_maps { struct buffer_instance { struct buffer_instance *next; struct tracecmd_instance *ftrace; + unsigned long long trace_id; char *cpumask; struct event_list *events; struct event_list **event_next; diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index fd7ca82..1583c53 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -5062,6 +5062,7 @@ void init_top_instance(void) top_instance.ftrace = tracecmd_create_instance(NULL); top_instance.cpu_count = tracecmd_count_cpus(); top_instance.flags = BUFFER_FL_KEEP; + top_instance.trace_id = tracecmd_generate_traceid(); tracecmd_init_instance(&top_instance); } -- 2.23.0