projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sg engine: errno return value fixes
[fio.git]
/
memory.c
diff --git
a/memory.c
b/memory.c
index f108e47065ccbc83f440bd4ced50ed3856bb3886..8d6f95579a3366cb633226237965c5de971243e4 100644
(file)
--- a/
memory.c
+++ b/
memory.c
@@
-70,14
+70,17
@@
int allocate_io_mem(struct thread_data *td)
td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
if (td->shm_id < 0) {
td_verror(td, errno, "shmget");
td->shm_id = shmget(IPC_PRIVATE, td->orig_buffer_size, flags);
if (td->shm_id < 0) {
td_verror(td, errno, "shmget");
- perror("shmget");
+ if (geteuid() != 0 && errno == ENOMEM)
+ log_err("fio: you may need to run this job as root\n");
+ if (errno == EINVAL && td->o.mem_type == MEM_SHMHUGE)
+ log_err("fio: check that you have free huge pages and that hugepage-size is correct.\n");
+
return 1;
}
td->orig_buffer = shmat(td->shm_id, NULL, 0);
if (td->orig_buffer == (void *) -1) {
td_verror(td, errno, "shmat");
return 1;
}
td->orig_buffer = shmat(td->shm_id, NULL, 0);
if (td->orig_buffer == (void *) -1) {
td_verror(td, errno, "shmat");
- perror("shmat");
td->orig_buffer = NULL;
return 1;
}
td->orig_buffer = NULL;
return 1;
}
@@
-91,8
+94,12
@@
int allocate_io_mem(struct thread_data *td)
td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
if (td->mmapfd < 0) {
td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
if (td->mmapfd < 0) {
- td_verror(td, errno, "open");
- perror("open mmap file");
+ td_verror(td, errno, "open mmap file");
+ td->orig_buffer = NULL;
+ return 1;
+ }
+ if (ftruncate(td->mmapfd, td->orig_buffer_size) < 0) {
+ td_verror(td, errno, "truncate mmap file");
td->orig_buffer = NULL;
return 1;
}
td->orig_buffer = NULL;
return 1;
}
@@
-102,7
+109,6
@@
int allocate_io_mem(struct thread_data *td)
td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0);
if (td->orig_buffer == MAP_FAILED) {
td_verror(td, errno, "mmap");
td->orig_buffer = mmap(NULL, td->orig_buffer_size, PROT_READ | PROT_WRITE, flags, td->mmapfd, 0);
if (td->orig_buffer == MAP_FAILED) {
td_verror(td, errno, "mmap");
- perror("mmap");
td->orig_buffer = NULL;
if (td->mmapfd) {
close(td->mmapfd);
td->orig_buffer = NULL;
if (td->mmapfd) {
close(td->mmapfd);