Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools lib fs: Adopt filename__read_int from tools/perf/

Will be useful for new helpers to read sysctl values.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+23 -18
+21
tools/lib/api/fs/fs.c
··· 7 7 #include <stdlib.h> 8 8 #include <string.h> 9 9 #include <sys/vfs.h> 10 + #include <sys/types.h> 11 + #include <sys/stat.h> 12 + #include <fcntl.h> 13 + #include <unistd.h> 10 14 11 15 #include "debugfs.h" 12 16 #include "fs.h" ··· 167 163 168 164 FS__MOUNTPOINT(sysfs, FS__SYSFS); 169 165 FS__MOUNTPOINT(procfs, FS__PROCFS); 166 + 167 + int filename__read_int(const char *filename, int *value) 168 + { 169 + char line[64]; 170 + int fd = open(filename, O_RDONLY), err = -1; 171 + 172 + if (fd < 0) 173 + return -1; 174 + 175 + if (read(fd, line, sizeof(line)) > 0) { 176 + *value = atoi(line); 177 + err = 0; 178 + } 179 + 180 + close(fd); 181 + return err; 182 + }
+2
tools/lib/api/fs/fs.h
··· 11 11 12 12 const char *sysfs__mountpoint(void); 13 13 const char *procfs__mountpoint(void); 14 + 15 + int filename__read_int(const char *filename, int *value); 14 16 #endif /* __API_FS__ */
-17
tools/perf/util/util.c
··· 442 442 return (unsigned long) -1; 443 443 } 444 444 445 - int filename__read_int(const char *filename, int *value) 446 - { 447 - char line[64]; 448 - int fd = open(filename, O_RDONLY), err = -1; 449 - 450 - if (fd < 0) 451 - return -1; 452 - 453 - if (read(fd, line, sizeof(line)) > 0) { 454 - *value = atoi(line); 455 - err = 0; 456 - } 457 - 458 - close(fd); 459 - return err; 460 - } 461 - 462 445 int filename__read_str(const char *filename, char **buf, size_t *sizep) 463 446 { 464 447 size_t size = 0, alloc_size = 0;
-1
tools/perf/util/util.h
··· 343 343 bool show_sym); 344 344 void free_srcline(char *srcline); 345 345 346 - int filename__read_int(const char *filename, int *value); 347 346 int filename__read_str(const char *filename, char **buf, size_t *sizep); 348 347 int perf_event_paranoid(void); 349 348