2016-10-13 16:20:04

by Alexander Alemayhu

[permalink] [raw]
Subject: [PATCH] perf: Fix typo "No enough" to "Not enough"

The latter version occurs much more when running git grep.

Signed-off-by: Alexander Alemayhu <[email protected]>
---
tools/perf/tests/backward-ring-buffer.c | 2 +-
tools/perf/tests/bpf.c | 2 +-
tools/perf/util/bpf-loader.c | 14 +++++++-------
tools/perf/util/llvm-utils.c | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
index e6d1816e431a..42e892b1e979 100644
--- a/tools/perf/tests/backward-ring-buffer.c
+++ b/tools/perf/tests/backward-ring-buffer.c
@@ -97,7 +97,7 @@ int test__backward_ring_buffer(int subtest __maybe_unused)

evlist = perf_evlist__new();
if (!evlist) {
- pr_debug("No enough memory to create evlist\n");
+ pr_debug("Not enough memory to create evlist\n");
return TEST_FAIL;
}

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 2673e86ed50f..8f0298aff222 100644
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -125,7 +125,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
/* Instead of perf_evlist__new_default, don't add default events */
evlist = perf_evlist__new();
if (!evlist) {
- pr_debug("No enough memory to create evlist\n");
+ pr_debug("Not enough memory to create evlist\n");
return TEST_FAIL;
}

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 2b2c9b82f5ab..a5fd275238f7 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -241,7 +241,7 @@ parse_prog_config_kvpair(const char *config_str, struct perf_probe_event *pev)
int err = 0;

if (!text) {
- pr_debug("No enough memory: dup config_str failed\n");
+ pr_debug("Not enough memory: dup config_str failed\n");
return ERR_PTR(-ENOMEM);
}

@@ -531,7 +531,7 @@ static int map_prologue(struct perf_probe_event *pev, int *mapping,

ptevs = malloc(array_sz);
if (!ptevs) {
- pr_debug("No enough memory: alloc ptevs failed\n");
+ pr_debug("Not enough memory: alloc ptevs failed\n");
return -ENOMEM;
}

@@ -604,13 +604,13 @@ static int hook_load_preprocessor(struct bpf_program *prog)
priv->need_prologue = true;
priv->insns_buf = malloc(sizeof(struct bpf_insn) * BPF_MAXINSNS);
if (!priv->insns_buf) {
- pr_debug("No enough memory: alloc insns_buf failed\n");
+ pr_debug("Not enough memory: alloc insns_buf failed\n");
return -ENOMEM;
}

priv->type_mapping = malloc(sizeof(int) * pev->ntevs);
if (!priv->type_mapping) {
- pr_debug("No enough memory: alloc type_mapping failed\n");
+ pr_debug("Not enough memory: alloc type_mapping failed\n");
return -ENOMEM;
}
memset(priv->type_mapping, -1,
@@ -864,7 +864,7 @@ bpf_map_op_setkey(struct bpf_map_op *op, struct parse_events_term *term)

op->k.array.ranges = memdup(term->array.ranges, memsz);
if (!op->k.array.ranges) {
- pr_debug("No enough memory to alloc indices for map\n");
+ pr_debug("Not enough memory to alloc indices for map\n");
return -ENOMEM;
}
op->key_type = BPF_MAP_KEY_RANGES;
@@ -929,7 +929,7 @@ bpf_map_priv__clone(struct bpf_map_priv *priv)

newpriv = zalloc(sizeof(*newpriv));
if (!newpriv) {
- pr_debug("No enough memory to alloc map private\n");
+ pr_debug("Not enough memory to alloc map private\n");
return NULL;
}
INIT_LIST_HEAD(&newpriv->ops_list);
@@ -960,7 +960,7 @@ bpf_map__add_op(struct bpf_map *map, struct bpf_map_op *op)
if (!priv) {
priv = zalloc(sizeof(*priv));
if (!priv) {
- pr_debug("No enough memory to alloc map private\n");
+ pr_debug("Not enough memory to alloc map private\n");
return -ENOMEM;
}
INIT_LIST_HEAD(&priv->ops_list);
diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index bf7216b8731d..27b6f303720a 100644
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -339,7 +339,7 @@ dump_obj(const char *path, void *obj_buf, size_t size)
char *p;

if (!obj_path) {
- pr_warning("WARNING: No enough memory, skip object dumping\n");
+ pr_warning("WARNING: Not enough memory, skip object dumping\n");
return;
}

--
2.10.1


2016-10-14 15:46:25

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH] perf: Fix typo "No enough" to "Not enough"

Em Thu, Oct 13, 2016 at 06:18:11PM +0200, Alexander Alemayhu escreveu:
> The latter version occurs much more when running git grep.

Thanks, applied, but please next time add to the CC list people that
last touched this code, like Wang, that I'm CC'ing here and in the patch
I just applied.

- Arnaldo

> Signed-off-by: Alexander Alemayhu <[email protected]>
> ---
> tools/perf/tests/backward-ring-buffer.c | 2 +-
> tools/perf/tests/bpf.c | 2 +-
> tools/perf/util/bpf-loader.c | 14 +++++++-------
> tools/perf/util/llvm-utils.c | 2 +-
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
> index e6d1816e431a..42e892b1e979 100644
> --- a/tools/perf/tests/backward-ring-buffer.c
> +++ b/tools/perf/tests/backward-ring-buffer.c
> @@ -97,7 +97,7 @@ int test__backward_ring_buffer(int subtest __maybe_unused)
>
> evlist = perf_evlist__new();
> if (!evlist) {
> - pr_debug("No enough memory to create evlist\n");
> + pr_debug("Not enough memory to create evlist\n");
> return TEST_FAIL;
> }
>
> diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
> index 2673e86ed50f..8f0298aff222 100644
> --- a/tools/perf/tests/bpf.c
> +++ b/tools/perf/tests/bpf.c
> @@ -125,7 +125,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
> /* Instead of perf_evlist__new_default, don't add default events */
> evlist = perf_evlist__new();
> if (!evlist) {
> - pr_debug("No enough memory to create evlist\n");
> + pr_debug("Not enough memory to create evlist\n");
> return TEST_FAIL;
> }
>
> diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
> index 2b2c9b82f5ab..a5fd275238f7 100644
> --- a/tools/perf/util/bpf-loader.c
> +++ b/tools/perf/util/bpf-loader.c
> @@ -241,7 +241,7 @@ parse_prog_config_kvpair(const char *config_str, struct perf_probe_event *pev)
> int err = 0;
>
> if (!text) {
> - pr_debug("No enough memory: dup config_str failed\n");
> + pr_debug("Not enough memory: dup config_str failed\n");
> return ERR_PTR(-ENOMEM);
> }
>
> @@ -531,7 +531,7 @@ static int map_prologue(struct perf_probe_event *pev, int *mapping,
>
> ptevs = malloc(array_sz);
> if (!ptevs) {
> - pr_debug("No enough memory: alloc ptevs failed\n");
> + pr_debug("Not enough memory: alloc ptevs failed\n");
> return -ENOMEM;
> }
>
> @@ -604,13 +604,13 @@ static int hook_load_preprocessor(struct bpf_program *prog)
> priv->need_prologue = true;
> priv->insns_buf = malloc(sizeof(struct bpf_insn) * BPF_MAXINSNS);
> if (!priv->insns_buf) {
> - pr_debug("No enough memory: alloc insns_buf failed\n");
> + pr_debug("Not enough memory: alloc insns_buf failed\n");
> return -ENOMEM;
> }
>
> priv->type_mapping = malloc(sizeof(int) * pev->ntevs);
> if (!priv->type_mapping) {
> - pr_debug("No enough memory: alloc type_mapping failed\n");
> + pr_debug("Not enough memory: alloc type_mapping failed\n");
> return -ENOMEM;
> }
> memset(priv->type_mapping, -1,
> @@ -864,7 +864,7 @@ bpf_map_op_setkey(struct bpf_map_op *op, struct parse_events_term *term)
>
> op->k.array.ranges = memdup(term->array.ranges, memsz);
> if (!op->k.array.ranges) {
> - pr_debug("No enough memory to alloc indices for map\n");
> + pr_debug("Not enough memory to alloc indices for map\n");
> return -ENOMEM;
> }
> op->key_type = BPF_MAP_KEY_RANGES;
> @@ -929,7 +929,7 @@ bpf_map_priv__clone(struct bpf_map_priv *priv)
>
> newpriv = zalloc(sizeof(*newpriv));
> if (!newpriv) {
> - pr_debug("No enough memory to alloc map private\n");
> + pr_debug("Not enough memory to alloc map private\n");
> return NULL;
> }
> INIT_LIST_HEAD(&newpriv->ops_list);
> @@ -960,7 +960,7 @@ bpf_map__add_op(struct bpf_map *map, struct bpf_map_op *op)
> if (!priv) {
> priv = zalloc(sizeof(*priv));
> if (!priv) {
> - pr_debug("No enough memory to alloc map private\n");
> + pr_debug("Not enough memory to alloc map private\n");
> return -ENOMEM;
> }
> INIT_LIST_HEAD(&priv->ops_list);
> diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
> index bf7216b8731d..27b6f303720a 100644
> --- a/tools/perf/util/llvm-utils.c
> +++ b/tools/perf/util/llvm-utils.c
> @@ -339,7 +339,7 @@ dump_obj(const char *path, void *obj_buf, size_t size)
> char *p;
>
> if (!obj_path) {
> - pr_warning("WARNING: No enough memory, skip object dumping\n");
> + pr_warning("WARNING: Not enough memory, skip object dumping\n");
> return;
> }
>
> --
> 2.10.1

2016-10-15 20:55:34

by Alexander Alemayhu

[permalink] [raw]
Subject: Re: [PATCH] perf: Fix typo "No enough" to "Not enough"

On Fri, Oct 14, 2016 at 12:46:04PM -0300, Arnaldo Carvalho de Melo wrote:
>
> Thanks, applied, but please next time add to the CC list people that
> last touched this code, like Wang, that I'm CC'ing here and in the patch
> I just applied.
>

Sorry, will do that next time.

--
Mit freundlichen Gr??en

Alexander Alemayhu

Subject: [tip:perf/core] perf tools: Fix typo "No enough" to "Not enough"

Commit-ID: 042cfb5fa6225ed4b04fd1051b3de16f260a9c67
Gitweb: http://git.kernel.org/tip/042cfb5fa6225ed4b04fd1051b3de16f260a9c67
Author: Alexander Alemayhu <[email protected]>
AuthorDate: Thu, 13 Oct 2016 18:18:11 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 24 Oct 2016 11:07:42 -0300

perf tools: Fix typo "No enough" to "Not enough"

The latter version occurs much more when running git grep.

Signed-off-by: Alexander Alemayhu <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/tests/backward-ring-buffer.c | 2 +-
tools/perf/tests/bpf.c | 2 +-
tools/perf/util/bpf-loader.c | 14 +++++++-------
tools/perf/util/llvm-utils.c | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
index e6d1816..42e892b 100644
--- a/tools/perf/tests/backward-ring-buffer.c
+++ b/tools/perf/tests/backward-ring-buffer.c
@@ -97,7 +97,7 @@ int test__backward_ring_buffer(int subtest __maybe_unused)

evlist = perf_evlist__new();
if (!evlist) {
- pr_debug("No enough memory to create evlist\n");
+ pr_debug("Not enough memory to create evlist\n");
return TEST_FAIL;
}

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 2673e86..8f0298a 100644
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -125,7 +125,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
/* Instead of perf_evlist__new_default, don't add default events */
evlist = perf_evlist__new();
if (!evlist) {
- pr_debug("No enough memory to create evlist\n");
+ pr_debug("Not enough memory to create evlist\n");
return TEST_FAIL;
}

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 2b2c9b8..a5fd275 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -241,7 +241,7 @@ parse_prog_config_kvpair(const char *config_str, struct perf_probe_event *pev)
int err = 0;

if (!text) {
- pr_debug("No enough memory: dup config_str failed\n");
+ pr_debug("Not enough memory: dup config_str failed\n");
return ERR_PTR(-ENOMEM);
}

@@ -531,7 +531,7 @@ static int map_prologue(struct perf_probe_event *pev, int *mapping,

ptevs = malloc(array_sz);
if (!ptevs) {
- pr_debug("No enough memory: alloc ptevs failed\n");
+ pr_debug("Not enough memory: alloc ptevs failed\n");
return -ENOMEM;
}

@@ -604,13 +604,13 @@ static int hook_load_preprocessor(struct bpf_program *prog)
priv->need_prologue = true;
priv->insns_buf = malloc(sizeof(struct bpf_insn) * BPF_MAXINSNS);
if (!priv->insns_buf) {
- pr_debug("No enough memory: alloc insns_buf failed\n");
+ pr_debug("Not enough memory: alloc insns_buf failed\n");
return -ENOMEM;
}

priv->type_mapping = malloc(sizeof(int) * pev->ntevs);
if (!priv->type_mapping) {
- pr_debug("No enough memory: alloc type_mapping failed\n");
+ pr_debug("Not enough memory: alloc type_mapping failed\n");
return -ENOMEM;
}
memset(priv->type_mapping, -1,
@@ -864,7 +864,7 @@ bpf_map_op_setkey(struct bpf_map_op *op, struct parse_events_term *term)

op->k.array.ranges = memdup(term->array.ranges, memsz);
if (!op->k.array.ranges) {
- pr_debug("No enough memory to alloc indices for map\n");
+ pr_debug("Not enough memory to alloc indices for map\n");
return -ENOMEM;
}
op->key_type = BPF_MAP_KEY_RANGES;
@@ -929,7 +929,7 @@ bpf_map_priv__clone(struct bpf_map_priv *priv)

newpriv = zalloc(sizeof(*newpriv));
if (!newpriv) {
- pr_debug("No enough memory to alloc map private\n");
+ pr_debug("Not enough memory to alloc map private\n");
return NULL;
}
INIT_LIST_HEAD(&newpriv->ops_list);
@@ -960,7 +960,7 @@ bpf_map__add_op(struct bpf_map *map, struct bpf_map_op *op)
if (!priv) {
priv = zalloc(sizeof(*priv));
if (!priv) {
- pr_debug("No enough memory to alloc map private\n");
+ pr_debug("Not enough memory to alloc map private\n");
return -ENOMEM;
}
INIT_LIST_HEAD(&priv->ops_list);
diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
index bf7216b..27b6f303 100644
--- a/tools/perf/util/llvm-utils.c
+++ b/tools/perf/util/llvm-utils.c
@@ -339,7 +339,7 @@ dump_obj(const char *path, void *obj_buf, size_t size)
char *p;

if (!obj_path) {
- pr_warning("WARNING: No enough memory, skip object dumping\n");
+ pr_warning("WARNING: Not enough memory, skip object dumping\n");
return;
}