commit 5e4b43810afa40456c21c15e0358e2026dd310a2
author Amit Pundir <amit.pundir@linaro.org> Sat Apr 07 07:54:08 2012 +0530
committer Amit Pundir <amit.pundir@linaro.org> Sat Apr 07 08:42:54 2012 +0530
tree 6a3d6f61dd2ff90a545526d46627809c0d69ec1c
parent 77acf17a389ed670ab97ba220986a164c2f33e0a

async io is not supported

disable DiskThreads and RandomDiskThreads

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

src/sat.cpp

diff --git a/src/sat.cpp b/src/sat.cpp
index dab70dc..2730ed1 100644
--- a/src/sat.cpp
+++ b/src/sat.cpp
@@ -1173,6 +1173,7 @@
   }
   workers_map_.insert(make_pair(kInvertType, invert_vector));
 
+#ifdef HAVE_LIBAIO_H
   // Disk stress threads.
   WorkerVector *disk_vector = new WorkerVector();
   WorkerVector *random_vector = new WorkerVector();
@@ -1215,6 +1216,7 @@
 
   workers_map_.insert(make_pair(kDiskType, disk_vector));
   workers_map_.insert(make_pair(kRandomDiskType, random_vector));
+#endif
 
   // CPU stress threads.
   WorkerVector *cpu_vector = new WorkerVector();

src/worker.cpp

diff --git a/src/worker.cpp b/src/worker.cpp
index b219122..e15589b 100644
--- a/src/worker.cpp
+++ b/src/worker.cpp
@@ -43,8 +43,10 @@
 // For size of block device
 #include <sys/ioctl.h>
 #include <linux/fs.h>
+#ifdef HAVE_LIBAIO_H
 // For asynchronous I/O
 #include <libaio.h>
+#endif
 
 #include <sys/syscall.h>
 
@@ -75,10 +77,12 @@
           unsigned int, len, cpu_set_t*, mask)
 #endif
 
+#ifdef HAVE_LIBAIO_H
 // Linux aio syscalls.
 #if !defined(__NR_io_setup)
 #error "No aio headers inculded, please install libaio."
 #endif
+#endif
 
 namespace {
   // Get HW core ID from cpuid instruction.
@@ -2518,6 +2522,7 @@
   return true;
 }
 
+#ifdef HAVE_LIBAIO_H
 DiskThread::DiskThread(DiskBlockTable *block_table) {
   read_block_size_ = kSectorSize;   // default 1 sector (512 bytes)
   write_block_size_ = kSectorSize;  // this assumes read and write block size
@@ -3195,6 +3200,7 @@
   pages_copied_ = blocks_read_;
   return true;
 }
+#endif
 
 MemoryRegionThread::MemoryRegionThread() {
   error_injection_ = false;

src/worker.h

diff --git a/src/worker.h b/src/worker.h
index cf83621..b138c5f 100644
--- a/src/worker.h
+++ b/src/worker.h
@@ -26,7 +26,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#ifdef HAVE_LIBAIO_H
 #include <libaio.h>
+#endif
 
 #include <queue>
 #include <set>
@@ -651,6 +653,7 @@
   DISALLOW_COPY_AND_ASSIGN(CpuCacheCoherencyThread);
 };
 
+#ifdef HAVE_LIBAIO_H
 // Worker thread to perform disk test.
 class DiskThread : public WorkerThread {
  public:
@@ -767,6 +770,7 @@
  protected:
   DISALLOW_COPY_AND_ASSIGN(RandomDiskThread);
 };
+#endif
 
 // Worker thread to perform checks in a specific memory region.
 class MemoryRegionThread : public WorkerThread {