Recent changes (master)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following changes since commit d9759b1e4081cc45b958d8ffd06607260cb5557e:

  Make hugetlbfs maping work (2013-01-17 13:28:15 +0100)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Bruce Cran (1):
      Windows: fix off-by-one error in fio_cpu_set and add affinity error messages.

Jens Axboe (1):
      Add info log on whether tsc is reliable or not for --cpuclock-test

 gettime.c       |    2 ++
 os/os-windows.h |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

---

Diff of recent changes:

diff --git a/gettime.c b/gettime.c
index e60d3e2..f29edcb 100644
--- a/gettime.c
+++ b/gettime.c
@@ -504,6 +504,8 @@ int fio_monotonic_clocktest(void)
 	uint64_t seq = 0;
 	int i;
 
+	log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
+
 	fio_debug |= 1U << FD_TIME;
 	calibrate_cpu_clock();
 	fio_debug &= ~(1U << FD_TIME);
diff --git a/os/os-windows.h b/os/os-windows.h
index 0b199c5..6862226 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -182,7 +182,12 @@ static inline int fio_setaffinity(int pid, os_cpu_mask_t cpumask)
 	h = OpenThread(THREAD_QUERY_INFORMATION | THREAD_SET_INFORMATION, TRUE, pid);
 	if (h != NULL) {
 		bSuccess = SetThreadAffinityMask(h, cpumask);
+		if (!bSuccess)
+			log_err("fio_setaffinity failed: failed to set thread affinity (pid %d, mask %.16llx)\n", pid, cpumask);
+
 		CloseHandle(h);
+	} else {
+		log_err("fio_setaffinity failed: failed to get handle for pid %d\n", pid);
 	}
 
 	return (bSuccess)? 0 : -1;
@@ -209,7 +214,7 @@ static inline void fio_cpu_clear(os_cpu_mask_t *mask, int cpu)
 
 static inline void fio_cpu_set(os_cpu_mask_t *mask, int cpu)
 {
-	*mask |= 1 << (cpu-1);
+	*mask |= 1 << cpu;
 }
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux SCSI]     [Linux IDE]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux