Add some more options for commands

[fio.git] / memory.c

diff --git a/memory.c b/memory.c
index 079c0760f0993d22baee775c43561e11d90c7bb1..9df2321153b0a944e4dca53707480f8030bb6cf1 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -34,7 +34,7 @@ int fio_pin_memory(void)
        if (phys_mem) {
                if ((mlock_size + 128 * 1024 * 1024) > phys_mem) {
                        mlock_size = phys_mem - 128 * 1024 * 1024;
-                       fprintf(f_out, "fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
+                       log_info("fio: limiting mlocked memory to %lluMiB\n", mlock_size >> 20);
                }
        }
 
@@ -69,14 +69,14 @@ 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);
+                       td_verror(td, errno, "shmget");
                        perror("shmget");
                        return 1;
                }
 
                td->orig_buffer = shmat(td->shm_id, NULL, 0);
                if (td->orig_buffer == (void *) -1) {
-                       td_verror(td, errno);
+                       td_verror(td, errno, "shmat");
                        perror("shmat");
                        td->orig_buffer = NULL;
                        return 1;
@@ -90,7 +90,7 @@ int allocate_io_mem(struct thread_data *td)
                        td->mmapfd = open(td->mmapfile, O_RDWR|O_CREAT, 0644);
 
                        if (td->mmapfd < 0) {
-                               td_verror(td, errno);
+                               td_verror(td, errno, "open");
                                perror("open mmap file");
                                td->orig_buffer = NULL;
                                return 1;
@@ -100,7 +100,7 @@ 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);
+                       td_verror(td, errno, "mmap");
                        perror("mmap");
                        td->orig_buffer = NULL;
                        if (td->mmapfd) {