From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759006AbcG1CGN (ORCPT ); Wed, 27 Jul 2016 22:06:13 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51701 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755861AbcG1CGG (ORCPT ); Wed, 27 Jul 2016 22:06:06 -0400 X-IBM-Helo: d01dlp02.pok.ibm.com X-IBM-MailFrom: rui.teng@linux.vnet.ibm.com From: Rui Teng To: linux-kernel@vger.kernel.org Cc: mingo@redhat.com, alexander.shishkin@linux.intel.com, peterz@infradead.org, Arnaldo Carvalho de Melo , Rui Teng Subject: [PATCH 1/2] perf: Fix errors reported by checkpatch.pl scripts Date: Thu, 28 Jul 2016 10:05:56 +0800 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16072802-0056-0000-0000-000000E70BB5 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005534; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000177; SDB=6.00736420; UDB=6.00345839; IPR=6.00509013; BA=6.00004625; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012091; XFM=3.00000011; UTC=2016-07-28 02:06:03 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16072802-0057-0000-0000-000005013C3B Message-Id: <1469671557-2256-1-git-send-email-rui.teng@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-07-28_01:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607280021 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Clear all the errors and also some warnings reported by checkpatch.pl scripts for file tools/perf/util/header.c Signed-off-by: Rui Teng --- tools/perf/util/header.c | 60 ++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 8f0db40..8d76d55 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -256,7 +256,8 @@ static int __write_cpudesc(int fd, const char *cpuinfo_proc) while (*q && isspace(*q)) q++; if (q != (p+1)) - while ((*r++ = *q++)); + while ((*r++ = *q++)) + ; } p++; } @@ -278,6 +279,7 @@ static int write_cpudesc(int fd, struct perf_header *h __maybe_unused, for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) { int ret; + ret = __write_cpudesc(fd, cpuinfo_procs[i]); if (ret >= 0) return ret; @@ -479,7 +481,7 @@ try_threads: } ret = 0; done: - if(fp) + if (fp) fclose(fp); free(buf); return ret; @@ -1036,24 +1038,28 @@ static int write_cache(int fd, struct perf_header *h __maybe_unused, struct cpu_cache_level *c = &caches[i]; #define _W(v) \ + do { \ ret = do_write(fd, &c->v, sizeof(u32)); \ if (ret < 0) \ - goto out; + goto out; \ + } while (0) - _W(level) - _W(line_size) - _W(sets) - _W(ways) + _W(level); + _W(line_size); + _W(sets); + _W(ways); #undef _W #define _W(v) \ + do { \ ret = do_write_string(fd, (const char *) c->v); \ if (ret < 0) \ - goto out; + goto out; \ + } while (0) - _W(type) - _W(size) - _W(map) + _W(type); + _W(size); + _W(map); #undef _W } @@ -1312,8 +1318,7 @@ static void print_numa_topology(struct perf_header *ph, int fd __maybe_unused, for (i = 0; i < ph->env.nr_numa_nodes; i++) { n = &ph->env.numa_nodes[i]; - fprintf(fp, "# node%u meminfo : total = %"PRIu64" kB," - " free = %"PRIu64" kB\n", + fprintf(fp, "# node%u meminfo : total = %"PRIu64" kB, free = %"PRIu64" kB\n", n->node, n->mem_total, n->mem_free); fprintf(fp, "# node%u cpu list : ", n->node); @@ -1570,6 +1575,7 @@ static int process_tracing_data(struct perf_file_section *section __maybe_unused int fd, void *data) { ssize_t ret = trace_report(fd, data, false); + return ret < 0 ? -1 : 0; } @@ -1862,8 +1868,7 @@ static int process_cpu_topology(struct perf_file_section *section, nr = bswap_32(nr); if (nr > (u32)cpu_nr) { - pr_debug("socket_id number is too big." - "You may need to upgrade the perf tool.\n"); + pr_debug("socket_id number is too big. You may need to upgrade the perf tool.\n"); goto free_cpu; } @@ -2226,8 +2231,8 @@ static int perf_file_section__fprintf_info(struct perf_file_section *section, struct header_print_data *hd = data; if (lseek(fd, section->offset, SEEK_SET) == (off_t)-1) { - pr_debug("Failed to lseek to %" PRIu64 " offset for feature " - "%d, continuing...\n", section->offset, feat); + pr_debug("Failed to lseek to %" PRIu64 " offset for feature %d, continuing...\n", + section->offset, feat); return 0; } if (feat >= HEADER_LAST_FEATURE) { @@ -2251,6 +2256,7 @@ int perf_header__fprintf_info(struct perf_session *session, FILE *fp, bool full) struct header_print_data hd; struct perf_header *header = &session->header; int fd = perf_data_file__fd(session->file); + hd.fp = fp; hd.full = full; @@ -2668,8 +2674,8 @@ static int perf_file_section__process(struct perf_file_section *section, int feat, int fd, void *data) { if (lseek(fd, section->offset, SEEK_SET) == (off_t)-1) { - pr_debug("Failed to lseek to %" PRIu64 " offset for feature " - "%d, continuing...\n", section->offset, feat); + pr_debug("Failed to lseek to %" PRIu64 " offset for feature %d, continuing...\n", + section->offset, feat); return 0; } @@ -2751,16 +2757,16 @@ static int read_attr(int fd, struct perf_header *ph, /* assume ABI0 */ sz = PERF_ATTR_SIZE_VER0; } else if (sz > our_sz) { - pr_debug("file uses a more recent and unsupported ABI" - " (%zu bytes extra)\n", sz - our_sz); + pr_debug("file uses a more recent and unsupported ABI (%zu bytes extra)\n", + sz - our_sz); return -1; } /* what we have not yet read and that we know about */ left = sz - PERF_ATTR_SIZE_VER0; if (left) { void *ptr = attr; - ptr += PERF_ATTR_SIZE_VER0; + ptr += PERF_ATTR_SIZE_VER0; ret = readn(fd, ptr, left); } /* read perf_file_section, ids are read in caller */ @@ -3002,7 +3008,7 @@ perf_event__synthesize_event_update_scale(struct perf_tool *tool, ev_data = (struct event_update_event_scale *) ev->data; ev_data->scale = evsel->scale; - err = process(tool, (union perf_event*) ev, NULL, NULL); + err = process(tool, (union perf_event *) ev, NULL, NULL); free(ev); return err; } @@ -3021,7 +3027,7 @@ perf_event__synthesize_event_update_name(struct perf_tool *tool, return -ENOMEM; strncpy(ev->data, evsel->name, len); - err = process(tool, (union perf_event*) ev, NULL, NULL); + err = process(tool, (union perf_event *) ev, NULL, NULL); free(ev); return err; } @@ -3052,7 +3058,7 @@ perf_event__synthesize_event_update_cpus(struct perf_tool *tool, evsel->own_cpus, type, max); - err = process(tool, (union perf_event*) ev, NULL, NULL); + err = process(tool, (union perf_event *) ev, NULL, NULL); free(ev); return err; } @@ -3146,9 +3152,8 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused, if (perf_evsel__alloc_id(evsel, 1, n_ids)) return -ENOMEM; - for (i = 0; i < n_ids; i++) { + for (i = 0; i < n_ids; i++) perf_evlist__id_add(evlist, evsel, 0, i, event->attr.id[i]); - } symbol_conf.nr_events = evlist->nr_entries; @@ -3269,6 +3274,7 @@ int perf_event__process_tracing_data(struct perf_tool *tool __maybe_unused, } if (session->repipe) { int retw = write(STDOUT_FILENO, buf, padding); + if (retw <= 0 || retw != padding) { pr_err("%s: repiping tracing data padding", __func__); return -1; -- 2.7.4