Em Tue, Feb 06, 2018 at 07:18:01PM +0100, Jiri Olsa escreveu: > Adding sysfs__read_xll function to be able to read sysfs > files with hex numbers in, which do not have 0x prefix.
Applied 2-5 in this series, continuing... - Arnaldo > Link: http://lkml.kernel.org/n/[email protected] > Signed-off-by: Jiri Olsa <[email protected]> > --- > tools/lib/api/fs/fs.c | 15 +++++++++++++-- > tools/lib/api/fs/fs.h | 1 + > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c > index 8b0e4a4315bd..6a12bbf39f7b 100644 > --- a/tools/lib/api/fs/fs.c > +++ b/tools/lib/api/fs/fs.c > @@ -432,7 +432,8 @@ int procfs__read_str(const char *entry, char **buf, > size_t *sizep) > return filename__read_str(path, buf, sizep); > } > > -int sysfs__read_ull(const char *entry, unsigned long long *value) > +static int sysfs__read_ull_base(const char *entry, > + unsigned long long *value, int base) > { > char path[PATH_MAX]; > const char *sysfs = sysfs__mountpoint(); > @@ -442,7 +443,17 @@ int sysfs__read_ull(const char *entry, unsigned long > long *value) > > snprintf(path, sizeof(path), "%s/%s", sysfs, entry); > > - return filename__read_ull(path, value); > + return filename__read_ull_base(path, value, base); > +} > + > +int sysfs__read_xll(const char *entry, unsigned long long *value) > +{ > + return sysfs__read_ull_base(entry, value, 16); > +} > + > +int sysfs__read_ull(const char *entry, unsigned long long *value) > +{ > + return sysfs__read_ull_base(entry, value, 0); > } > > int sysfs__read_int(const char *entry, int *value) > diff --git a/tools/lib/api/fs/fs.h b/tools/lib/api/fs/fs.h > index 8ebee35a6395..92d03b8396b1 100644 > --- a/tools/lib/api/fs/fs.h > +++ b/tools/lib/api/fs/fs.h > @@ -40,6 +40,7 @@ int procfs__read_str(const char *entry, char **buf, size_t > *sizep); > int sysctl__read_int(const char *sysctl, int *value); > int sysfs__read_int(const char *entry, int *value); > int sysfs__read_ull(const char *entry, unsigned long long *value); > +int sysfs__read_xll(const char *entry, unsigned long long *value); > int sysfs__read_str(const char *entry, char **buf, size_t *sizep); > int sysfs__read_bool(const char *entry, bool *value); > > -- > 2.13.6
