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

Commit c168fbfb authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Eliminate duplicate code and use PATH_MAX consistently 

No need for multiple definitions for STR() and die(), also use SuSv2's
PATH_MAX instead of adding MAX_PATH.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-qpujjkw7u0bf0tr4wt55cr9y@git.kernel.org


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

tools/perf/builtin-probe.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#define DEFAULT_VAR_FILTER "!__k???tab_* & !__crc_*"

#define DEFAULT_FUNC_FILTER "!_*"

#define MAX_PATH_LEN 256



/* Session management structure */

static struct {

tools/perf/util/cgroup.c

+7 −8
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include "parse-options.h"

#include "evsel.h"

#include "cgroup.h"

#include "debugfs.h" /* MAX_PATH, STR() */

#include "evlist.h"



int nr_cgroups;
@@ -12,7 +11,7 @@ static int 
cgroupfs_find_mountpoint(char *buf, size_t maxlen)

{

	FILE *fp;

	char mountpoint[MAX_PATH+1], tokens[MAX_PATH+1], type[MAX_PATH+1];

	char mountpoint[PATH_MAX + 1], tokens[PATH_MAX + 1], type[PATH_MAX + 1];

	char *token, *saved_ptr = NULL;

	int found = 0;
@@ -25,8 +24,8 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen) 
	 * and inspect every cgroupfs mount point to find one that has

	 * perf_event subsystem

	 */

	while (fscanf(fp, "%*s %"STR(MAX_PATH)"s %"STR(MAX_PATH)"s %"

				STR(MAX_PATH)"s %*d %*d\n",

	while (fscanf(fp, "%*s %"STR(PATH_MAX)"s %"STR(PATH_MAX)"s %"

				STR(PATH_MAX)"s %*d %*d\n",

				mountpoint, type, tokens) == 3) {



		if (!strcmp(type, "cgroup")) {
@@ -57,15 +56,15 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen) 


static int open_cgroup(char *name)

{

	char path[MAX_PATH+1];

	char mnt[MAX_PATH+1];

	char path[PATH_MAX + 1];

	char mnt[PATH_MAX + 1];

	int fd;





	if (cgroupfs_find_mountpoint(mnt, MAX_PATH+1))

	if (cgroupfs_find_mountpoint(mnt, PATH_MAX + 1))

		return -1;



	snprintf(path, MAX_PATH, "%s/%s", mnt, name);

	snprintf(path, PATH_MAX, "%s/%s", mnt, name);



	fd = open(path, O_RDONLY);

	if (fd == -1)

tools/perf/util/debugfs.c

+6 −6
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ 
#include "debugfs.h"

#include "cache.h"



#include <sys/mount.h>



static int debugfs_premounted;

static char debugfs_mountpoint[MAX_PATH+1];

static char debugfs_mountpoint[PATH_MAX + 1];



static const char *debugfs_known_mountpoints[] = {

	"/sys/kernel/debug/",
@@ -64,9 +66,7 @@ const char *debugfs_find_mountpoint(void) 
	if (fp == NULL)

		die("Can't open /proc/mounts for read");



	while (fscanf(fp, "%*s %"

		      STR(MAX_PATH)

		      "s %99s %*s %*d %*d\n",

	while (fscanf(fp, "%*s %" STR(PATH_MAX) "s %99s %*s %*d %*d\n",

		      debugfs_mountpoint, type) == 2) {

		if (strcmp(type, "debugfs") == 0)

			break;
@@ -158,7 +158,7 @@ int debugfs_umount(void) 


int debugfs_write(const char *entry, const char *value)

{

	char path[MAX_PATH+1];

	char path[PATH_MAX + 1];

	int ret, count;

	int fd;
@@ -203,7 +203,7 @@ int debugfs_write(const char *entry, const char *value) 
 */

int debugfs_read(const char *entry, char *buffer, size_t size)

{

	char path[MAX_PATH+1];

	char path[PATH_MAX + 1];

	int ret;

	int fd;

tools/perf/util/debugfs.h

+9 −20
Original line number Diff line number Diff line 
#ifndef __DEBUGFS_H__

#define __DEBUGFS_H__



#include <sys/mount.h>



#ifndef MAX_PATH

# define MAX_PATH 256

#endif



#ifndef STR

# define _STR(x) #x

# define STR(x) _STR(x)

#endif



extern const char *debugfs_find_mountpoint(void);

extern int debugfs_valid_mountpoint(const char *debugfs);

extern int debugfs_valid_entry(const char *path);

extern char *debugfs_mount(const char *mountpoint);

extern int debugfs_umount(void);

extern int debugfs_write(const char *entry, const char *value);

extern int debugfs_read(const char *entry, char *buffer, size_t size);

extern void debugfs_force_cleanup(void);

extern int debugfs_make_path(const char *element, char *buffer, int size);

const char *debugfs_find_mountpoint(void);

int debugfs_valid_mountpoint(const char *debugfs);

int debugfs_valid_entry(const char *path);

char *debugfs_mount(const char *mountpoint);

int debugfs_umount(void);

int debugfs_write(const char *entry, const char *value);

int debugfs_read(const char *entry, char *buffer, size_t size);

void debugfs_force_cleanup(void);

int debugfs_make_path(const char *element, char *buffer, int size);



#endif /* __DEBUGFS_H__ */

tools/perf/util/probe-finder.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include "util.h"

#include "probe-event.h"



#define MAX_PATH_LEN		 256

#define MAX_PROBE_BUFFER	1024

#define MAX_PROBES		 128