Received: by 10.223.164.202 with SMTP id h10csp649903wrb; Thu, 30 Nov 2017 05:24:25 -0800 (PST) X-Google-Smtp-Source: AGs4zMY8oFX2o7OCAJbQLk3nFYKRDx9GBb6B7Zk6e2xAv1Apf+7lECIPEil0/3CUbDKtpkMZL50U X-Received: by 10.98.55.3 with SMTP id e3mr6528740pfa.63.1512048265655; Thu, 30 Nov 2017 05:24:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512048265; cv=none; d=google.com; s=arc-20160816; b=rbQhf8uJ1MRF6OTRalybKShq7xQD3evXsvXjNCOL2QNLdxhXpzaLurgHRT8OxdBY7x 032YF6iATD7bN8bl57tyGfn5nslO2s40DNMcm1EzR+K+wtCYuXvqRpxk67FVEuyRTnHM Ai9EKRVaQv0JNplZ3Kke7h3h+xB311z5M5B9l0dkBDrjdIfQTHg58NAQc3Kww2L5gb2v cFSUbLU9VVM6wzgBxL4pGwMD20LR83UN6T+DNQTEzPgeAC46jFoSC5v+SauxT8SF/bbp UpP06+x4NIlycC4gHfb7Mh+8/QgIb4EM9lh9GTOI+2bJ1UoE26n+OwKAUJDorpGnKNrq iKyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=NqIgp6mo1SvuC1puTWJ4VFBd6N/JBz054g7ZRwnwPTc=; b=yGVnD2P3rJwW148e0E0rj8blk8/p26qe1bUumUOdMxruYLQ0FqXu8i5nNLvkm4+Wx3 1tlIQfjUxq/42v2Nv4KFpk42T4XTSPCmSysTIX6y9RnzLvI+gUbdaOF2rCc7QJIPQJbV LoLa3DzMNiOraRmdc0YcCQvvVikHAH6yo4C6ng4uutqxTCGFPOx/zqmpn/wLmbPSX9fS guSTYeMb5boyycrtsJgb45uiWlKGCWHn44ImjzlbVx/sNu+TiXMOcYXNvLhTkhkq+JPF n9bkSanJfxwHeg5IGqUHWhohyn2lExnm4FuellIqJi58zxY2qcIlOaQWDEaW97ZmaEyS eogA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=p82LonF1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si3103931plk.773.2017.11.30.05.24.12; Thu, 30 Nov 2017 05:24:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=p82LonF1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753267AbdK3NXO (ORCPT + 99 others); Thu, 30 Nov 2017 08:23:14 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:44566 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbdK3NUk (ORCPT ); Thu, 30 Nov 2017 08:20:40 -0500 Received: by mail-wm0-f65.google.com with SMTP id t8so12954541wmc.3 for ; Thu, 30 Nov 2017 05:20:40 -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; bh=NqIgp6mo1SvuC1puTWJ4VFBd6N/JBz054g7ZRwnwPTc=; b=p82LonF1aBr6Y4rft5juvFMsW5bJQcepqAFNf7M+eF4tg2vw8roEXM6Yr9g0QrdX2i 1rj5zJnizmY/ep427JoF5/2G6PRZOvSCnJqWSWVRFVhcV8bKUqvtG+dVrENCl+DDtSsP 6Bm64a99ap8GX5NejIE51d5R8zbx+dSkw2+X5jSrVe+ygytI+fS3yOpYR5IfuEdG8Y7I LpXj81EShEQIrZXe9G4bJ2x2oYDD17VcZCUsmvYJCFtoKDuZTA8Idgcw5ty7rpMesDVq G8y4LK5OFiuA3I0RihkDXmap/c4asMnAWSigCInPdUD10ze3m8aGnu8ClXzsozOIFvzR CICQ== 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; bh=NqIgp6mo1SvuC1puTWJ4VFBd6N/JBz054g7ZRwnwPTc=; b=WAkEKqGiJdUTaNdvBZDvuIw8Z5TXw1Cmw+4g6Mo4ch+07mOM64XBjFuehmSecxuQBz L37WWmj55q4U6MTyR04IZQC/kNkx3bhZI4tu8eM5CdEv7MnIJESnYI38mGInIYeTo9I7 kEFAKnJE8yqxlMhRnNZFcD7YuBoM/r5W+6o2JhoNo8KkWQhL/V5XN97KtP3Nv0F8brMx 9NqWg2x5+qfbUR0qpxevxka0qE0yeNHkCjnJVPIwX6OqbGKp9eWUDzCqxH53Dkxp1uJr 88RG2FJ1/xLp4ZcXvhnzJplcCd5cVt8GJSWRviVatj7DGf5XOJP8foiSiYYHAqhobeLU VStQ== X-Gm-Message-State: AJaThX7/wX5f1tLpQ6KhaaIb3mRSLsd0dxqu9tNPkM2sD0Th13qTHo/x rSRpNLqxM2RA1pz8+aQnUEeKpw== X-Received: by 10.28.164.66 with SMTP id n63mr547789wme.7.1512048039538; Thu, 30 Nov 2017 05:20:39 -0800 (PST) Received: from localhost.localdomain ([87.121.44.226]) by smtp.gmail.com with ESMTPSA id p200sm3539734wmd.9.2017.11.30.05.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 05:20:38 -0800 (PST) From: "Vladislav Valtchev (VMware)" To: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, y.karadz@gmail.com, "Vladislav Valtchev (VMware)" Subject: [PATCH v2 05/10] trace-cmd: Making start,extract,stream,profile separate funcs Date: Thu, 30 Nov 2017 15:19:52 +0200 Message-Id: <20171130131957.21617-6-vladislav.valtchev@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171130131957.21617-1-vladislav.valtchev@gmail.com> References: <20171130131957.21617-1-vladislav.valtchev@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This simple patch make the above-mentioned commands independent from 'record'. The point of doing so is to follow the convention of one entry-point per command that is followed by most of trace-cmd's code. Ultimately that aims to prevent the complexity to concentrate in a single point, making the code simpler to maintain. Signed-off-by: Vladislav Valtchev (VMware) --- trace-cmd.c | 8 +++---- trace-local.h | 8 +++++++ trace-record.c | 72 ++++++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 64 insertions(+), 24 deletions(-) diff --git a/trace-cmd.c b/trace-cmd.c index dd1c108..6c2efa3 100644 --- a/trace-cmd.c +++ b/trace-cmd.c @@ -102,11 +102,11 @@ struct command commands[] = { {"stack", trace_stack}, {"check-events", trace_check_events}, {"record", trace_record}, - {"start", trace_record}, - {"extract", trace_record}, + {"start", trace_start}, + {"extract", trace_extract}, {"stop", trace_stop}, - {"stream", trace_record}, - {"profile", trace_record}, + {"stream", trace_stream}, + {"profile", trace_profile}, {"restart", trace_restart}, {"reset", trace_reset}, {"stat", trace_stat}, diff --git a/trace-local.h b/trace-local.h index fa5232b..eaae430 100644 --- a/trace-local.h +++ b/trace-local.h @@ -64,6 +64,14 @@ void trace_restart(int argc, char **argv); void trace_reset(int argc, char **argv); +void trace_start(int argc, char **argv); + +void trace_extract(int argc, char **argv); + +void trace_stream(int argc, char **argv); + +void trace_profile(int argc, char **argv); + void trace_report(int argc, char **argv); void trace_split(int argc, char **argv); diff --git a/trace-record.c b/trace-record.c index 827189d..6c12416 100644 --- a/trace-record.c +++ b/trace-record.c @@ -4387,10 +4387,12 @@ struct common_record_context { int run_command; }; -static void init_common_record_context(struct common_record_context *ctx) +static void init_common_record_context(struct common_record_context *ctx, + enum trace_cmd curr_cmd) { memset(ctx, 0, sizeof(*ctx)); ctx->instance = &top_instance; + ctx->curr_cmd = curr_cmd; init_instance(ctx->instance); cpu_count = count_cpus(); } @@ -4739,9 +4741,12 @@ static void parse_record_options(int argc, "Did you mean 'record'?"); ctx->run_command = 1; } - } +/* + * This function contains common code for the following commands: + * record, start, extract, stream, profile. + */ static void record_trace(int argc, char **argv, struct common_record_context *ctx) { @@ -4901,7 +4906,7 @@ static void record_trace(int argc, char **argv, destroy_stats(); if (keep) - exit(0); + return; update_reset_files(); update_reset_triggers(); @@ -4924,7 +4929,49 @@ static void record_trace(int argc, char **argv, if (IS_PROFILE(ctx)) do_trace_profile(); +} +void trace_start(int argc, char **argv) +{ + struct common_record_context ctx; + + init_common_record_context(&ctx, CMD_start); + parse_record_options(argc, argv, &ctx); + record_trace(argc, argv, &ctx); + exit(0); +} + +void trace_extract(int argc, char **argv) +{ + struct common_record_context ctx; + + init_common_record_context(&ctx, CMD_extract); + parse_record_options(argc, argv, &ctx); + record_trace(argc, argv, &ctx); + exit(0); +} + +void trace_stream(int argc, char **argv) +{ + struct common_record_context ctx; + + init_common_record_context(&ctx, CMD_stream); + parse_record_options(argc, argv, &ctx); + record_trace(argc, argv, &ctx); + exit(0); +} + +void trace_profile(int argc, char **argv) +{ + struct common_record_context ctx; + + init_common_record_context(&ctx, CMD_profile); + + handle_init = trace_init_profile; + ctx.events = 1; + + parse_record_options(argc, argv, &ctx); + record_trace(argc, argv, &ctx); exit(0); } @@ -4932,23 +4979,8 @@ void trace_record(int argc, char **argv) { struct common_record_context ctx; - init_common_record_context(&ctx); - - if (strcmp(argv[1], "record") == 0) - ctx.curr_cmd = CMD_record; - else if (strcmp(argv[1], "start") == 0) - ctx.curr_cmd = CMD_start; - else if (strcmp(argv[1], "extract") == 0) - ctx.curr_cmd = CMD_extract; - else if (strcmp(argv[1], "stream") == 0) - ctx.curr_cmd = CMD_stream; - else if (strcmp(argv[1], "profile") == 0) { - ctx.curr_cmd = CMD_profile; - handle_init = trace_init_profile; - ctx.events = 1; - } else - usage(argv); - + init_common_record_context(&ctx, CMD_record); parse_record_options(argc, argv, &ctx); record_trace(argc, argv, &ctx); + exit(0); } -- 2.14.1 From 1585425621543637305@xxx Wed Nov 29 18:21:35 +0000 2017 X-GM-THRID: 1585425621543637305 X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread