summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2014-12-10 05:49:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-10 05:49:33 +0000
commit97c6f43c51ac6efa2174fef523276494b9975011 (patch)
tree0f772e2d3607b08144a7342bf7c361b07482f83a
parent5ebcac32772426a8bc0cb0cd15502207f1476011 (diff)
parent6e86b511cfbdbd3f52cd228f52822e9602a23bb4 (diff)
downloadextras-97c6f43c51ac6efa2174fef523276494b9975011.tar.gz
Merge "Change file to include sys/time.h directly."
-rw-r--r--tests/pagingtest/mmap_test.c6
-rw-r--r--tests/pagingtest/pageinout_test.c6
-rw-r--r--tests/pagingtest/pagingtest.c10
-rw-r--r--tests/pagingtest/thrashing_test.c6
4 files changed, 17 insertions, 11 deletions
diff --git a/tests/pagingtest/mmap_test.c b/tests/pagingtest/mmap_test.c
index 07ba94b0..d0d9846a 100644
--- a/tests/pagingtest/mmap_test.c
+++ b/tests/pagingtest/mmap_test.c
@@ -1,8 +1,10 @@
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
-#include <sys/mman.h>
-#include <errno.h>
#include <string.h>
+#include <sys/mman.h>
+#include <sys/time.h>
+
#include "pagingtest.h"
int mmap_test(int test_runs, unsigned long long alloc_size) {
diff --git a/tests/pagingtest/pageinout_test.c b/tests/pagingtest/pageinout_test.c
index 4c5a0e3d..b9b20de6 100644
--- a/tests/pagingtest/pageinout_test.c
+++ b/tests/pagingtest/pageinout_test.c
@@ -1,9 +1,11 @@
+#include <errno.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include <sys/mman.h>
-#include <fcntl.h>
+#include <sys/time.h>
+
#include "pagingtest.h"
int pageinout_test(int test_runs, unsigned long long file_size) {
diff --git a/tests/pagingtest/pagingtest.c b/tests/pagingtest/pagingtest.c
index 04ef0ccf..e2bd7923 100644
--- a/tests/pagingtest/pagingtest.c
+++ b/tests/pagingtest/pagingtest.c
@@ -1,13 +1,13 @@
+#include "pagingtest.h"
+
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
-#include <unistd.h>
#include <sys/mman.h>
-#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
-#include "pagingtest.h"
+#include <sys/types.h>
+#include <unistd.h>
#define TEST_RUNS 10
#define ALLOC_SIZE (10 * 1024 * 1024)
diff --git a/tests/pagingtest/thrashing_test.c b/tests/pagingtest/thrashing_test.c
index c1ce162c..165cd991 100644
--- a/tests/pagingtest/thrashing_test.c
+++ b/tests/pagingtest/thrashing_test.c
@@ -1,9 +1,11 @@
+#include <errno.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-#include <errno.h>
-#include <fcntl.h>
+#include <sys/time.h>
+
#include "pagingtest.h"
#define LINESIZE 32