Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
  • Steven Rostedt (Google)'s avatar
    tracing/treewide: Remove second parameter of __assign_str() · 2c92ca84
    Steven Rostedt (Google) authored
    With the rework of how the __string() handles dynamic strings where it
    saves off the source string in field in the helper structure[1], the
    assignment of that value to the trace event field is stored in the helper
    value and does not need to be passed in again.
    
    This means that with:
    
      __string(field, mystring)
    
    Which use to be assigned with __assign_str(field, mystring), no longer
    needs the second parameter and it is unused. With this, __assign_str()
    will now only get a single parameter.
    
    There's over 700 users of __assign_str() and because coccinelle does not
    handle the TRACE_EVENT() macro I ended up using the following sed script:
    
      git grep -l __assign_str | while read a ; do
          sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
          mv /tmp/test-file $a;
      done
    
    I then searched for __assign_str() that did not end with ';' as those
    were multi line assignments that the sed script above would fail to catch.
    
    Note, the same updates will need to be done for:
    
      __assign_str_len()
      __assign_rel_str()
      __assign_rel_str_len()
    
    I tested this with both an allmodconfig and an allyesconfig (build only for both).
    
    [1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
    
    Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
    
    
    
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Julia Lawall <Julia.Lawall@inria.fr>
    Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
    Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
    Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
    Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
    Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
    Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
    Acked-by: Darrick J. Wong <djwong@kernel.org>	# xfs
    Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
    2c92ca84