From: Jim Cromie <jim.cromie@gmail.com>
To: linux-kernel@vger.kernel.org, jbaron@akamai.com,
gregkh@linuxfoundation.org, dri-devel@lists.freedesktop.org,
amd-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org
Cc: daniel.vetter@ffwll.ch, jani.nikula@intel.com,
ville.syrjala@linux.intel.com, seanpaul@chromium.org,
robdclark@gmail.com, groeck@google.com, yanivt@google.com,
bleung@google.com, linux-doc@vger.kernel.org,
Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH v7 15/25] dyndbg: add for_each_boxed_vector
Date: Thu, 12 Oct 2023 11:21:26 -0600 [thread overview]
Message-ID: <20231012172137.3286566-16-jim.cromie@gmail.com> (raw)
In-Reply-To: <20231012172137.3286566-1-jim.cromie@gmail.com>
Add a for_each iterator to walk a counted vector member in a struct
(ie the box), and use it to replace 8 open-coded loops.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
v5- parens-on-box-force-precedence
---
lib/dynamic_debug.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index be49e104ec76..c11feca70d6f 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -158,6 +158,9 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg)
_dt->num_class_users); \
})
+#define for_each_boxed_vector(_box, _vec, _len, _ct, _curs) \
+ for (_ct = 0, _curs = (_box)->_vec; _ct < (_box)->_len; _ct++, _curs++)
+
#define __outvar /* filled by callee */
static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt,
const char *class_string,
@@ -167,7 +170,7 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons
struct ddebug_class_user *cli;
int i, idx;
- for (i = 0, map = dt->classes; i < dt->num_classes; i++, map++) {
+ for_each_boxed_vector(dt, classes, num_classes, i, map) {
idx = match_string(map->class_names, map->length, class_string);
if (idx >= 0) {
*class_id = idx + map->base;
@@ -175,7 +178,7 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons
return map;
}
}
- for (i = 0, cli = dt->class_users; i < dt->num_class_users; i++, cli++) {
+ for_each_boxed_vector(dt, class_users, num_class_users, i, cli) {
idx = match_string(cli->map->class_names, cli->map->length, class_string);
if (idx >= 0) {
*class_id = idx + cli->map->base;
@@ -1058,11 +1061,11 @@ static const char *ddebug_class_name(struct ddebug_table *dt, struct _ddebug *dp
struct ddebug_class_user *cli = dt->class_users;
int i;
- for (i = 0; i < dt->num_classes; i++, map++)
+ for_each_boxed_vector(dt, classes, num_classes, i, map)
if (class_in_range(dp->class_id, map))
return map->class_names[dp->class_id - map->base];
- for (i = 0; i < dt->num_class_users; i++, cli++)
+ for_each_boxed_vector(dt, class_users, num_class_users, i, cli)
if (class_in_range(dp->class_id, cli->map))
return cli->map->class_names[dp->class_id - cli->map->base];
@@ -1216,7 +1219,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug
struct ddebug_class_map *cm;
int i, nc = 0;
- for (i = 0, cm = di->classes; i < di->num_classes; i++, cm++) {
+ for_each_boxed_vector(di, classes, num_classes, i, cm) {
if (!strcmp(cm->mod_name, dt->mod_name)) {
vpr_cm_info(cm, "classes[%d]:", i);
@@ -1230,7 +1233,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug
vpr_info("module:%s attached %d classes\n", dt->mod_name, nc);
dt->num_classes = nc;
- for (i = 0, cm = dt->classes; i < dt->num_classes; i++, cm++)
+ for_each_boxed_vector(di, classes, num_classes, i, cm)
ddebug_apply_params(cm, cm->mod_name);
}
@@ -1250,7 +1253,7 @@ static void ddebug_attach_user_module_classes(struct ddebug_table *dt,
* module's refs, save to dt. For loadables, this is the
* whole array.
*/
- for (i = 0, cli = di->class_users; i < di->num_class_users; i++, cli++) {
+ for_each_boxed_vector(di, class_users, num_class_users, i, cli) {
if (WARN_ON(!cli || !cli->map || !cli->user_mod_name))
continue;
@@ -1268,8 +1271,7 @@ static void ddebug_attach_user_module_classes(struct ddebug_table *dt,
dt->num_class_users = nc;
- /* now iterate dt */
- for (i = 0, cli = dt->class_users; i < dt->num_class_users; i++, cli++)
+ for_each_boxed_vector(di, class_users, num_class_users, i, cli)
ddebug_apply_params(cli->map, cli->user_mod_name);
vpr_dt_info(dt, "attach-client-module: ");
--
2.41.0
next prev parent reply other threads:[~2023-10-12 17:23 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 17:21 [PATCH v7 00/25] fix DRM_USE_DYNAMIC_DEBUG=y regression Jim Cromie
2023-10-12 17:21 ` [PATCH v7 01/25] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2023-10-12 17:21 ` [PATCH v7 02/25] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2023-10-12 17:21 ` [PATCH v7 03/25] dyndbg: make ddebug_class_param union members same size Jim Cromie
2023-10-12 17:21 ` [PATCH v7 04/25] dyndbg: replace classmap list with a vector Jim Cromie
2023-10-12 17:21 ` [PATCH v7 05/25] dyndbg: ddebug_apply_class_bitmap - add module arg, select on it Jim Cromie
2023-10-12 17:21 ` [PATCH v7 06/25] dyndbg: split param_set_dyndbg_classes to module/wrapper fns Jim Cromie
2023-10-12 17:21 ` [PATCH v7 07/25] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2023-10-12 17:21 ` [PATCH v7 08/25] dyndbg: reduce verbose/debug clutter Jim Cromie
2023-10-12 17:21 ` [PATCH v7 09/25] dyndbg: silence debugs with no-change updates Jim Cromie
2023-10-12 17:21 ` [PATCH v7 10/25] dyndbg: tighten ddebug_class_name() 1st arg type Jim Cromie
2023-10-12 17:21 ` [PATCH v7 11/25] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2023-10-12 17:21 ` [PATCH v7 12/25] dyndbg: reduce verbose=3 messages in ddebug_add_module Jim Cromie
2023-10-12 17:21 ` [PATCH v7 13/25] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2023-10-12 17:21 ` [PATCH v7 14/25] dyndbg-API: fix CONFIG_DRM_USE_DYNAMIC_DEBUG regression Jim Cromie
2023-10-12 17:21 ` Jim Cromie [this message]
2023-10-12 17:21 ` [PATCH v7 16/25] dyndbg: refactor ddebug_classparam_clamp_input Jim Cromie
2023-10-12 17:21 ` [PATCH v7 17/25] dyndbg-API: promote DYNDBG_CLASSMAP_PARAM to API Jim Cromie
2023-10-12 17:21 ` [PATCH v7 18/25] dyndbg-doc: add classmap info to howto Jim Cromie
2023-10-12 17:21 ` [PATCH v7 19/25] dyndbg: reserve flag bit _DPRINTK_FLAGS_PREFIX_CACHED Jim Cromie
2023-10-12 17:21 ` [PATCH v7 20/25] dyndbg: add _DPRINTK_FLAGS_INCL_LOOKUP Jim Cromie
2023-10-12 17:21 ` [PATCH v7 21/25] dyndbg: refactor *dynamic_emit_prefix Jim Cromie
2023-10-12 17:21 ` [PATCH v7 22/25] dyndbg: improve err report in attach_user_module_classes Jim Cromie
2023-10-12 17:21 ` [PATCH v7 23/25] drm: use correct ccflags-y spelling Jim Cromie
2023-10-12 17:21 ` [PATCH v7 24/25] drm-drivers: DRM_CLASSMAP_USE in 2nd batch of drivers, helpers Jim Cromie
2023-10-12 17:21 ` [PATCH v7 25/25] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Jim Cromie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231012172137.3286566-16-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bleung@google.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=groeck@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jbaron@akamai.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=seanpaul@chromium.org \
--cc=ville.syrjala@linux.intel.com \
--cc=yanivt@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).