Skip to content

/sys/kernel/debug/tracing is deeply deprecated. #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomas-wk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

/sys/kernel/debug/tracing is deeply deprecated. #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 32 additions & 14 deletions ras-events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static const struct event_trigger event_triggers[] = {
#endif
};

static int get_debugfs_dir(char *tracing_dir, size_t len)
static int get_mountdir_by_type(char *mount_type, char *tracing_dir, size_t len)
{
FILE *fp;
char line[MAX_PATH + 1 + 256];
Expand Down Expand Up @@ -93,18 +93,29 @@ static int get_debugfs_dir(char *tracing_dir, size_t len)
if (!type)
break;

if (!strcmp(type, "debugfs")) {
if (!strcmp(type, mount_type)) {
fclose(fp);
strscpy(tracing_dir, dir, len - 1);
return 0;
}
} while (1);

fclose(fp);
log(ALL, LOG_INFO, "Can't find debugfs\n");
log(ALL, LOG_INFO, "Can't find mountdir for type: %s\n", mount_type);
return -ENOENT;
}

static int get_debugfs_dir(char *tracing_dir, size_t len)
{
return get_mountdir_by_type("debugfs", tracing_dir, len);
}


static int get_tracefs_dir(char *tracing_dir, size_t len)
{
return get_mountdir_by_type("tracefs", tracing_dir, len);
}

static int wait_access(char *path, int ms)
{
int i;
Expand Down Expand Up @@ -154,18 +165,26 @@ static int open_trace(struct ras_events *ras, char *name, int flags)
static int get_tracing_dir(struct ras_events *ras)
{
char fname[MAX_PATH + 1];
char debugfs[MAX_PATH + 1];
int rc, has_instances = 0;
DIR *dir;
struct dirent *entry;

get_debugfs_dir(ras->debugfs, sizeof(ras->debugfs));

rc = strscpy(fname, ras->debugfs, sizeof(fname));
rc = get_tracefs_dir(fname, sizeof(fname));
if (rc < 0)
return rc;
rc = strscat(fname, "/tracing", sizeof(fname));
if (rc < 0)
return rc;
{
/* check under deprecated debugfs location */
rc = get_debugfs_dir(debugfs, sizeof(debugfs));
if (rc < 0)
return rc;

rc = strscpy(fname, debugfs, sizeof(fname));
if (rc < 0)
return rc;
rc = strscat(fname, "/tracing", sizeof(fname));
if (rc < 0)
return rc;
}

dir = opendir(fname);
if (!dir)
Expand All @@ -179,8 +198,7 @@ static int get_tracing_dir(struct ras_events *ras)
}
closedir(dir);

strscpy(ras->tracing, ras->debugfs, sizeof(ras->tracing));
strscat(ras->tracing, "/tracing", sizeof(ras->tracing));
strscpy(ras->tracing, fname, sizeof(ras->tracing));
if (has_instances) {
rc = strscat(ras->tracing, "/instances/" TOOL_NAME,
sizeof(ras->tracing));
Expand Down Expand Up @@ -836,8 +854,8 @@ static bool check_event_exist(struct ras_events *ras, char *group, char *event)
{
char fname[MAX_PATH + 256];

snprintf(fname, sizeof(fname), "%s/tracing/events/%s/%s",
ras->debugfs, group, event);
snprintf(fname, sizeof(fname), "%s/events/%s/%s",
ras->tracing, group, event);
if (access(fname, F_OK) == 0)
return true;

Expand Down
1 change: 0 additions & 1 deletion ras-events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ enum {
};

struct ras_events {
char debugfs[MAX_PATH + 1];
char tracing[MAX_PATH + 1];
struct tep_handle *pevent;
int page_size;
Expand Down