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

Commit db9f11e3 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

perf tools: Use DECLARE_BITMAP instead of an open-coded array 



Use DECLARE_BITMAP instead of an open coded array for our bitmap
of featured sections.

This makes the array an unsigned long instead of a u64 but since
we use a 256 bits bitmap, the array size shouldn't vary between
different boxes.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1255795038-13751-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2ba08250

tools/perf/util/header.c

+9 −13
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#include "../perf.h"

#include "trace-event.h"



#include <linux/bitmap.h>



/*

 * Create new perf.data header attribute:

 */
@@ -143,12 +141,12 @@ struct perf_file_header { 
	struct perf_file_section	attrs;

	struct perf_file_section	data;

	struct perf_file_section	event_types;

	feat_mask_t			adds_features;

	DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);

};



void perf_header__feat_trace_info(struct perf_header *header)

{

	set_bit(HEADER_TRACE_INFO, perf_header__adds_mask(header));

	set_bit(HEADER_TRACE_INFO, header->adds_features);

}



static void do_write(int fd, void *buf, size_t size)
@@ -168,7 +166,7 @@ static void perf_header__adds_write(struct perf_header *self, int fd) 
{

	struct perf_file_section trace_sec;

	u64 cur_offset = lseek(fd, 0, SEEK_CUR);

	unsigned long *feat_mask = perf_header__adds_mask(self);

	unsigned long *feat_mask = self->adds_features;



	if (test_bit(HEADER_TRACE_INFO, feat_mask)) {

		/* Write trace info */
@@ -250,7 +248,7 @@ void perf_header__write(struct perf_header *self, int fd) 
		},

	};



	memcpy(&f_header.adds_features, &self->adds_features, sizeof(feat_mask_t));

	memcpy(&f_header.adds_features, &self->adds_features, sizeof(self->adds_features));



	lseek(fd, 0, SEEK_SET);

	do_write(fd, &f_header, sizeof(f_header));
@@ -276,7 +274,7 @@ static void do_read(int fd, void *buf, size_t size) 


static void perf_header__adds_read(struct perf_header *self, int fd)

{

	const unsigned long *feat_mask = perf_header__adds_mask(self);

	const unsigned long *feat_mask = self->adds_features;



	if (test_bit(HEADER_TRACE_INFO, feat_mask)) {

		struct perf_file_section trace_sec;
@@ -306,11 +304,9 @@ struct perf_header *perf_header__read(int fd) 


	if (f_header.size != sizeof(f_header)) {

		/* Support the previous format */

		if (f_header.size == offsetof(typeof(f_header), adds_features)) {

			unsigned long *mask = (unsigned long *)(void *)

					&f_header.adds_features;

			bitmap_zero(mask, HEADER_FEAT_BITS);

		} else

		if (f_header.size == offsetof(typeof(f_header), adds_features))

			bitmap_zero(f_header.adds_features, HEADER_FEAT_BITS);

		else

			die("incompatible file format");

	}

	nr_attrs = f_header.attrs.size / sizeof(f_attr);
@@ -346,7 +342,7 @@ struct perf_header *perf_header__read(int fd) 
		event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);

	}



	memcpy(&self->adds_features, &f_header.adds_features, sizeof(feat_mask_t));

	memcpy(&self->adds_features, &f_header.adds_features, sizeof(f_header.adds_features));



	perf_header__adds_read(self, fd);

tools/perf/util/header.h

+3 −8
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <sys/types.h>

#include "types.h"



#include <linux/bitmap.h>



struct perf_header_attr {

	struct perf_event_attr attr;

	int ids, size;
@@ -16,8 +18,6 @@ struct perf_header_attr { 


#define HEADER_FEAT_BITS			256



typedef	typeof(u64[HEADER_FEAT_BITS / 8])	feat_mask_t;



struct perf_header {

	int			frozen;

	int			attrs, size;
@@ -27,14 +27,9 @@ struct perf_header { 
	u64			data_size;

	u64			event_offset;

	u64			event_size;

	feat_mask_t		adds_features;

	DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);

};



static inline unsigned long *perf_header__adds_mask(struct perf_header *self)

{

	return (unsigned long *)(void *)&self->adds_features;

}



struct perf_header *perf_header__read(int fd);

void perf_header__write(struct perf_header *self, int fd);

tools/perf/util/include/asm/asm-offsets.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
/* stub */

tools/perf/util/include/linux/types.h

+7 −1
Original line number Diff line number Diff line 
/* stub */
 
#ifndef _PERF_LINUX_TYPES_H_

#define _PERF_LINUX_TYPES_H_



#define DECLARE_BITMAP(name,bits) \

	unsigned long name[BITS_TO_LONGS(bits)]



#endif