From nobody Thu Aug 11 14:32:49 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M3Tmf0pDtz4Y1dG; Thu, 11 Aug 2022 14:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3Tmd46n5z3MS4; Thu, 11 Aug 2022 14:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXgu7wa3vJNsiNPwHshXfmnUdnPgL0jQHi6lwfaUZYQ=; b=U5ZCRArWCFNLlLS3fc89MgpMsqdmGxHcEIUgdJqPYglVhEcywH2QlbKkB0H+fZHvFDzw0P Jij33wJLROlz8IlowV+iqzaOfJWwfiJRss0jbQ/CEROVLdP9OBFKc696nqXPEJmyNym4fq rYwsov7jSmpwsM5iMvY1A7lolQ3ZcqCMqCVTN/ySGrOb4XcEZr5sYZiQ1MR9Fv3H5JHkCp BfuD1pyLaRsMZ6UgtLM5h/9diQZUDLUDcQj9HrQVMhWwe8xn50C0mWhKaGf4J9yQZCoPAB n1Z+m4yrS3J/09axVDQoL9SeBax1e3G9fcMVJfU784xcZONWo2F7h6DH67pC0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M3Tmd1FypzvLW; Thu, 11 Aug 2022 14:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27BEWn6I004544; Thu, 11 Aug 2022 14:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BEWnXb004543; Thu, 11 Aug 2022 14:32:49 GMT (envelope-from git) Date: Thu, 11 Aug 2022 14:32:49 GMT Message-Id: <202208111432.27BEWnXb004543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 742622502ec0 - stable/13 - db_command.c: use designated initializers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 742622502ec0f29e0bea4ee36cefd18fae144a58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660228369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CXgu7wa3vJNsiNPwHshXfmnUdnPgL0jQHi6lwfaUZYQ=; b=IhEpM89+EnYcZTNMw3FWp8PmEICSO+PEZFZ2KQ6d50D+iH+/O4mtMUnC+hlbjjt49HuAOl Fh9/3f8K98h9mDKS3v+pAjjZwQrIOaAwdHpkKyP3kS/dChp7SQunLIXXX8lQUxkl4vvjCq EBREiIgvPSsKpJfffIDzzQYH8sSZm0vvI2gkb5PsM4gRgvmlfNuubUBZFPeY1IVqBXLiYV YydAqHKl5DpvqUxEfBS8uXgIyg0xPoN5i24fQLVw5dPUBYFfAS5TOpDa+sC4DUlkD7d35x KT2DjoEA82U37ObS5yT1gJ3YenMR6WBaReNDOP3Ye+NvO7omc25LJepsitN+Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660228369; a=rsa-sha256; cv=none; b=xyoTnRS4pXFU7ZwVDMC9+Jxnrr4bPmzRkMcHYE7p1bYpQLB+d6UrfrLgns8Y1amDwuITBh 7+aLV1e7uPiMdcmDGWtnQqIAFbczv6mLhnaviaoL27GtbM6HkFH0GgckV+iaZralwvZF3Y RhjGhRgxsAQrKApUJRLxFy/5KgcMg/7X2wrjbhgULCAFiKSzmuu27TwIgcib8EGwLmHaYn Bd2Q12BBSreudwk5S7uKfhefzFsKAV3hNCvVQwsPyuyVQezCEbwHMPK+W4jbhjZXFvVKj5 4mTTcgnJOCyJoYLrmoq9WH697FNUH387/J5cgP/V5u8nktTVvaCA8X9oBJS40g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=742622502ec0f29e0bea4ee36cefd18fae144a58 commit 742622502ec0f29e0bea4ee36cefd18fae144a58 Author: Mitchell Horne AuthorDate: 2022-07-05 14:45:47 +0000 Commit: Mitchell Horne CommitDate: 2022-08-11 14:22:26 +0000 db_command.c: use designated initializers Provide separate helper macros for regular commands and next-level table commands as they are mutually exclusive. This ensures proper initialization of each element and allows us to exclude some redundant fields, such as specifying .more = NULL for every regular command. Reviewed by: markj, jhb MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35580 (cherry picked from commit 8a0994823365740f4d92842c2d6f7f524310ba64) --- sys/ddb/db_command.c | 127 ++++++++++++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 57 deletions(-) diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 4c42ee6a6e6b..28c7faee670b 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -79,84 +79,97 @@ static db_cmdfcn_t db_stack_trace_active; static db_cmdfcn_t db_stack_trace_all; static db_cmdfcn_t db_watchdog; -/* - * 'show' commands - */ +#define DB_CMD(_name, _func, _flags) \ +{ \ + .name = (_name), \ + .fcn = (_func), \ + .flag = (_flags), \ + .more = NULL, \ +} +#define DB_TABLE(_name, _more) \ +{ \ + .name = (_name), \ + .fcn = NULL, \ + .more = (_more), \ +} static struct db_command db_show_active_cmds[] = { - { "trace", db_stack_trace_active, 0, NULL }, + DB_CMD("trace", db_stack_trace_active, 0), }; struct db_command_table db_show_active_table = LIST_HEAD_INITIALIZER(db_show_active_table); static struct db_command db_show_all_cmds[] = { - { "trace", db_stack_trace_all, 0, NULL }, + DB_CMD("trace", db_stack_trace_all, 0), }; struct db_command_table db_show_all_table = LIST_HEAD_INITIALIZER(db_show_all_table); static struct db_command db_show_cmds[] = { - { "active", 0, 0, &db_show_active_table }, - { "all", 0, 0, &db_show_all_table }, - { "registers", db_show_regs, 0, NULL }, - { "breaks", db_listbreak_cmd, 0, NULL }, - { "threads", db_show_threads, 0, NULL }, + DB_TABLE("active", &db_show_active_table), + DB_TABLE("all", &db_show_all_table), + DB_CMD("registers", db_show_regs, 0), + DB_CMD("breaks", db_listbreak_cmd, 0), + DB_CMD("threads", db_show_threads, 0), }; struct db_command_table db_show_table = LIST_HEAD_INITIALIZER(db_show_table); static struct db_command db_cmds[] = { - { "print", db_print_cmd, 0, NULL }, - { "p", db_print_cmd, 0, NULL }, - { "examine", db_examine_cmd, CS_SET_DOT, NULL }, - { "x", db_examine_cmd, CS_SET_DOT, NULL }, - { "search", db_search_cmd, CS_OWN|CS_SET_DOT, NULL }, - { "set", db_set_cmd, CS_OWN, NULL }, - { "write", db_write_cmd, CS_MORE|CS_SET_DOT, NULL }, - { "w", db_write_cmd, CS_MORE|CS_SET_DOT, NULL }, - { "delete", db_delete_cmd, 0, NULL }, - { "d", db_delete_cmd, 0, NULL }, - { "dump", db_dump, 0, NULL }, - { "break", db_breakpoint_cmd, 0, NULL }, - { "b", db_breakpoint_cmd, 0, NULL }, - { "dwatch", db_deletewatch_cmd, 0, NULL }, - { "watch", db_watchpoint_cmd, CS_MORE,NULL }, - { "dhwatch", db_deletehwatch_cmd, 0, NULL }, - { "hwatch", db_hwatchpoint_cmd, 0, NULL }, - { "step", db_single_step_cmd, 0, NULL }, - { "s", db_single_step_cmd, 0, NULL }, - { "continue", db_continue_cmd, 0, NULL }, - { "c", db_continue_cmd, 0, NULL }, - { "until", db_trace_until_call_cmd,0, NULL }, - { "next", db_trace_until_matching_cmd,0, NULL }, - { "match", db_trace_until_matching_cmd,0, NULL }, - { "trace", db_stack_trace, CS_OWN, NULL }, - { "t", db_stack_trace, CS_OWN, NULL }, + DB_TABLE("show", &db_show_table), + DB_CMD("print", db_print_cmd, 0), + DB_CMD("p", db_print_cmd, 0), + DB_CMD("examine", db_examine_cmd, CS_SET_DOT), + DB_CMD("x", db_examine_cmd, CS_SET_DOT), + DB_CMD("search", db_search_cmd, CS_OWN|CS_SET_DOT), + DB_CMD("set", db_set_cmd, CS_OWN), + DB_CMD("write", db_write_cmd, CS_MORE|CS_SET_DOT), + DB_CMD("w", db_write_cmd, CS_MORE|CS_SET_DOT), + DB_CMD("delete", db_delete_cmd, 0), + DB_CMD("d", db_delete_cmd, 0), + DB_CMD("dump", db_dump, 0), + DB_CMD("break", db_breakpoint_cmd, 0), + DB_CMD("b", db_breakpoint_cmd, 0), + DB_CMD("dwatch", db_deletewatch_cmd, 0), + DB_CMD("watch", db_watchpoint_cmd, CS_MORE), + DB_CMD("dhwatch", db_deletehwatch_cmd, 0), + DB_CMD("hwatch", db_hwatchpoint_cmd, 0), + DB_CMD("step", db_single_step_cmd, 0), + DB_CMD("s", db_single_step_cmd, 0), + DB_CMD("continue", db_continue_cmd, 0), + DB_CMD("c", db_continue_cmd, 0), + DB_CMD("until", db_trace_until_call_cmd, 0), + DB_CMD("next", db_trace_until_matching_cmd, 0), + DB_CMD("match", db_trace_until_matching_cmd, 0), + DB_CMD("trace", db_stack_trace, CS_OWN), + DB_CMD("t", db_stack_trace, CS_OWN), /* XXX alias for active trace */ - { "acttrace", db_stack_trace_active, 0, NULL }, + DB_CMD("acttrace", db_stack_trace_active, 0), /* XXX alias for all trace */ - { "alltrace", db_stack_trace_all, 0, NULL }, - { "where", db_stack_trace, CS_OWN, NULL }, - { "bt", db_stack_trace, CS_OWN, NULL }, - { "call", db_fncall, CS_OWN, NULL }, - { "show", 0, 0, &db_show_table }, - { "ps", db_ps, 0, NULL }, - { "gdb", db_gdb, 0, NULL }, - { "halt", db_halt, 0, NULL }, - { "reboot", db_reset, 0, NULL }, - { "reset", db_reset, 0, NULL }, - { "kill", db_kill, CS_OWN, NULL }, - { "watchdog", db_watchdog, CS_OWN, NULL }, - { "thread", db_set_thread, 0, NULL }, - { "run", db_run_cmd, CS_OWN, NULL }, - { "script", db_script_cmd, CS_OWN, NULL }, - { "scripts", db_scripts_cmd, 0, NULL }, - { "unscript", db_unscript_cmd, CS_OWN, NULL }, - { "capture", db_capture_cmd, CS_OWN, NULL }, - { "textdump", db_textdump_cmd, CS_OWN, NULL }, - { "findstack", db_findstack_cmd, 0, NULL }, + DB_CMD("alltrace", db_stack_trace_all, 0), + DB_CMD("where", db_stack_trace, CS_OWN), + DB_CMD("bt", db_stack_trace, CS_OWN), + DB_CMD("call", db_fncall, CS_OWN), + DB_CMD("ps", db_ps, 0), + DB_CMD("gdb", db_gdb, 0), + DB_CMD("halt", db_halt, 0), + DB_CMD("reboot", db_reset, 0), + DB_CMD("reset", db_reset, 0), + DB_CMD("kill", db_kill, CS_OWN), + DB_CMD("watchdog", db_watchdog, CS_OWN), + DB_CMD("thread", db_set_thread, 0), + DB_CMD("run", db_run_cmd, CS_OWN), + DB_CMD("script", db_script_cmd, CS_OWN), + DB_CMD("scripts", db_scripts_cmd, 0), + DB_CMD("unscript", db_unscript_cmd, CS_OWN), + DB_CMD("capture", db_capture_cmd, CS_OWN), + DB_CMD("textdump", db_textdump_cmd, CS_OWN), + DB_CMD("findstack", db_findstack_cmd, 0), }; struct db_command_table db_cmd_table = LIST_HEAD_INITIALIZER(db_cmd_table); +#undef DB_CMD +#undef DB_TABLE + static struct db_command *db_last_command = NULL; /*