projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 1.32
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index 1cd8272d5241750c67107536b2a0a1268236e7c0..dd9c5aaf493ce6ff403e5b1ec92c5390d7b82bb1 100644
(file)
--- a/
os/os-linux.h
+++ b/
os/os-linux.h
@@
-55,13
+55,13
@@
typedef struct drand48_data os_random_state_t;
* the affinity helpers to work.
*/
#ifndef GLIBC_2_3_2
* the affinity helpers to work.
*/
#ifndef GLIBC_2_3_2
-#define fio_setaffinity(
td)
\
- sched_setaffinity((
td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask
)
+#define fio_setaffinity(
pid, cpumask)
\
+ sched_setaffinity((
pid), sizeof(cpumask), &(cpumask)
)
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
#else
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
#else
-#define fio_setaffinity(
td)
\
- sched_setaffinity((
td)->pid, &(td)->o.cpumask
)
+#define fio_setaffinity(
pid, cpumask)
\
+ sched_setaffinity((
pid), &(cpumask)
)
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), (ptr))
#endif
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), (ptr))
#endif
@@
-263,10
+263,13
@@
static inline int arch_cache_line_size(void)
return -1;
ret = read(fd, size, sizeof(size));
return -1;
ret = read(fd, size, sizeof(size));
+
+ close(fd);
+
if (ret <= 0)
return -1;
if (ret <= 0)
return -1;
-
- return atoi(size);
+ else
+
return atoi(size);
}
#endif
}
#endif