On Fri, Aug 22, 2014 at 05:23:55PM +0200, Jiri Olsa wrote:
> On Fri, Aug 22, 2014 at 12:16:51PM -0300, Arnaldo Carvalho de Melo wrote:
>
> SNIP
>
> > > }
> > >
> > > +static int setup_sort_order(void)
> > > +{
> > > +#define BUF_MAX 4096
> >
> > This is an arbitrary value, and you will use this just here, so you
> > could just have used a number and later used sizeof(buf).
> >
> > Anyway, what bothers me is the use of yet another static buffer.
> >
> > The thing to use here is asprintf, that will do it all for you, format
> > _and_ allocate a buffer the size you need.
> >
> > > + static char buf[BUF_MAX];
> > > +
> > > + if (!sort_order || is_strict_order(sort_order))
> > > + return 0;
> > > +
> > > + if (!strlen(sort_order + 1)) {
> > > + error("Invalid --fields key: `+'");
> > > + return -EINVAL;
> > > + }
> > > +
> > > + scnprintf(buf, BUF_MAX, "%s,%s",
> > > + get_default_sort_order(),
> > > + sort_order + 1);
> > > +
> > > + sort_order = buf;
> >
> > I.e. it would be better to have this as:
> >
> > char *new_sort_order;
> >
> > if (sort_order[1] == '\0') {
> > error("Invalid --fields key: `+'");
> > return -EINVAL;
> > }
> >
> > if (asprintf(&new_sort_order, "%s,%s",
> > get_default_sort_order(), sort_order + 1) < 0) {
> > error("Not enough memory to set up --sort");
> > return -ENOMEM;
> > }
>
> ok, will check the asprintf
>
> >
> > sort_order = new_sort_order;
> >
> > > + return 0;
> >
> >
> > Also please fix the error message, there is a cut'n'paste error there :-)
>
> aargh right ;-)
>
> I'll send v2
attached v2 with changes suggested above:
- use dynamic memory instead static buffer
- fix error message typo
thanks,
jirka
---
Adding support to add field(s) to default sort order
via using the '+' prefix, like for report:
$ perf report
Samples: 2K of event 'cycles', Event count (approx.): 882172583
Overhead Command Shared Object Symbol
7.39% swapper [kernel.kallsyms] [k] intel_idle
1.97% firefox libpthread-2.17.so [.] pthread_mutex_lock
1.39% firefox [snd_hda_intel] [k] azx_get_position
1.11% firefox libpthread-2.17.so [.]
pthread_mutex_unlock
$ perf report -s +cpu
Samples: 2K of event 'cycles', Event count (approx.): 882172583
Overhead Command Shared Object Symbol
CPU
2.89% swapper [kernel.kallsyms] [k] intel_idle
000
2.61% swapper [kernel.kallsyms] [k] intel_idle
002
1.20% swapper [kernel.kallsyms] [k] intel_idle
001
0.82% firefox libpthread-2.17.so [.]
pthread_mutex_lock 002
Works in general for commands using --sort option.
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jean Pihet <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
---
tools/perf/util/sort.c | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 1958637cf136..289df9d1e65a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1446,12 +1446,47 @@ static const char *get_default_sort_order(void)
return default_sort_orders[sort__mode];
}
+static int setup_sort_order(void)
+{
+ char *new_sort_order;
+
+ /*
+ * Append '+'-prefixed sort order to the default sort
+ * order string.
+ */
+ if (!sort_order || is_strict_order(sort_order))
+ return 0;
+
+ if (sort_order[1] == '\0') {
+ error("Invalid --sort key: `+'");
+ return -EINVAL;
+ }
+
+ /*
+ * We allocate new sort_order string, but we never free it,
+ * because it's checked over the rest of the code.
+ */
+ if (asprintf(&new_sort_order, "%s,%s",
+ get_default_sort_order(), sort_order + 1) < 0) {
+ error("Not enough memory to set up --sort");
+ return -ENOMEM;
+ }
+
+ sort_order = new_sort_order;
+ return 0;
+}
+
static int __setup_sorting(void)
{
char *tmp, *tok, *str;
- const char *sort_keys = sort_order;
+ const char *sort_keys;
int ret = 0;
+ ret = setup_sort_order();
+ if (ret)
+ return ret;
+
+ sort_keys = sort_order;
if (sort_keys == NULL) {
if (is_strict_order(field_order)) {
/*
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
