From patchwork Thu Jun 7 06:54:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 926177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 411brm4YbTz9s1b for ; Thu, 7 Jun 2018 16:55:04 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 411brm3MyVzF32m for ; Thu, 7 Jun 2018 16:55:04 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 411brL3Wr7zF32h for ; Thu, 7 Jun 2018 16:54:42 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=neuling.org Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 411brK5NRQz9s71; Thu, 7 Jun 2018 16:54:41 +1000 (AEST) Received: by localhost.localdomain (Postfix, from userid 1000) id 8C7D6EE7920; Thu, 7 Jun 2018 16:54:41 +1000 (AEST) From: Michael Neuling To: alistair@popple.id.au Date: Thu, 7 Jun 2018 16:54:33 +1000 Message-Id: <20180607065438.18257-6-mikey@neuling.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180607065438.18257-1-mikey@neuling.org> References: <20180607065438.18257-1-mikey@neuling.org> Subject: [Pdbg] [PATCH 06/11] Remove htm_* options X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pdbg@lists.ozlabs.org MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" These have been marked deprecated for a while and are just taking up room in the help, so let's remove them. The are replaced with "htm core|nest [options]" Signed-off-by: Michael Neuling --- src/htm.c | 95 ------------------------------------------------------ src/htm.h | 8 ----- src/main.c | 7 ---- 3 files changed, 110 deletions(-) diff --git a/src/htm.c b/src/htm.c index f0073548a3..e5e29f5e0b 100644 --- a/src/htm.c +++ b/src/htm.c @@ -380,98 +380,3 @@ int run_htm(int optind, int argc, char *argv[]) return rc; } - -/* - * Handle the deprecated commands by telling the user what the new - * command is. - */ -int run_htm_start(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest start\n"); - - return 0; -} - -int run_htm_stop(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest stop\n"); - - return 0; -} - -int run_htm_status(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest status\n"); - - return 0; -} - -int run_htm_reset(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest reset\n"); - - return 0; -} - -int run_htm_dump(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest dump\n"); - - return 0; -} - -int run_htm_trace(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest trace\n"); - - return 0; -} - -int run_htm_analyse(int optind, int argc, char *argv[]) -{ - int i; - - fprintf(stderr, "You're running a deprecated command!\n"); - fprintf(stderr, "Please use:\n"); - for (i = 0; i < optind; i++) - fprintf(stderr, "%s ", argv[i]); - fprintf(stderr, "htm nest analyse\n"); - - return 0; -} diff --git a/src/htm.h b/src/htm.h index f5ffa7689f..21e7b77744 100644 --- a/src/htm.h +++ b/src/htm.h @@ -16,12 +16,4 @@ #include #include -int run_htm_start(int optind, int argc, char *argv[]); -int run_htm_stop(int optind, int argc, char *argv[]); -int run_htm_status(int optind, int argc, char *argv[]); -int run_htm_reset(int optind, int argc, char *argv[]); -int run_htm_dump(int optind, int argc, char *argv[]); -int run_htm_trace(int optind, int argc, char *argv[]); -int run_htm_analyse(int optind, int argc, char *argv[]); - int run_htm(int optind, int argc, char *argv[]); diff --git a/src/main.c b/src/main.c index 1422c3f7bb..ad725ec1d2 100644 --- a/src/main.c +++ b/src/main.c @@ -100,13 +100,6 @@ static struct action actions[] = { { "start", "", "Start thread", &thread_start }, { "step", "", "Set a thread instructions", &thread_step }, { "stop", "", "Stop thread", &thread_stop }, - { "htm_start", "", "[deprecated use 'htm nest start'] Start Nest HTM", &run_htm_start }, - { "htm_stop", "", "[deprecated use 'htm nest stop'] Stop Nest HTM", &run_htm_stop }, - { "htm_status", "", "[deprecated use 'htm nest status'] Print the status of HTM", &run_htm_status }, - { "htm_reset", "", "[deprecated use 'htm nest reset'] Reset the HTM facility", &run_htm_reset }, - { "htm_dump", "", "[deprecated use 'htm nest dump'] Dump HTM buffer to file", &run_htm_dump }, - { "htm_trace", "" , "[deprecated use 'htm nest trace'] Configure and start tracing with HTM", &run_htm_trace }, - { "htm_analyse", "", "[derepcated use 'htm nest analyse'] Stop and dump buffer to file", &run_htm_analyse }, { "htm", "core|nest start|stop|status|reset|dump|trace|analyse", "Hardware Trace Macro", &run_htm }, { "release", "", "Should be called after pdbg work is finished, to release special wakeups and other resources.", &handle_release}, { "probe", "", "", &handle_probe },