Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b8f51a6 authored by David Carrillo-Cisneros's avatar David Carrillo-Cisneros Committed by Arnaldo Carvalho de Melo
Browse files

perf header: Revamp do_write() 



Now that writen takes a const buffer, use it in do_write instead of
duplicating its functionality.

Export do_write to use it consistently in header.c and build_id.c .

Signed-off-by: default avatarDavid Carrillo-Cisneros <davidcc@google.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170718042549.145161-6-davidcc@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7c724405

tools/perf/util/build-id.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id, 
	b.header.misc = misc;

	b.header.size = sizeof(b) + len;



	err = writen(fd, &b, sizeof(b));

	err = do_write(fd, &b, sizeof(b));

	if (err < 0)

		return err;

tools/perf/util/header.c

+5 −9
Original line number Diff line number Diff line
@@ -75,17 +75,13 @@ bool perf_header__has_feat(const struct perf_header *header, int feat) 
}



/* Return: 0 if succeded, -ERR if failed. */

static int do_write(int fd, const void *buf, size_t size)

int do_write(int fd, const void *buf, size_t size)

{

	while (size) {

		int ret = write(fd, buf, size);



		if (ret < 0)

			return -errno;

	ssize_t ret;



		size -= ret;

		buf += ret;

	}

	ret  = writen(fd, buf, size);

	if (ret != (ssize_t)size)

		return ret < 0 ? (int)ret : -1;



	return 0;

}

tools/perf/util/header.h

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ bool is_perf_magic(u64 magic); 


#define NAME_ALIGN 64



int do_write(int fd, const void *buf, size_t size);



int write_padded(int fd, const void *bf, size_t count, size_t count_aligned);



/*