Changeset 8754

Timestamp:

03/03/11 17:58:33 (2 years ago)

Author:

sampson

Message:

Windows testing

Location:

branches/windows-client

Files:

• projects/TestOrangeFS/TestOrangeFS.sln (modified) (2 diffs)
• projects/TestOrangeFS/posix-test (added)
• projects/TestOrangeFS/posix-test/posix-test.vcxproj (added)
• src/client/windows/client-test/test-io.c (modified) (6 diffs)
• test/posix/open.c (modified) (8 diffs)

branches/windows-client/projects/TestOrangeFS/TestOrangeFS.sln

@@ -138 +138 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client-test", "client-test\client-test.vcxproj", "{28761587-FE68-4AEB-8BF0-AB73484A0AD4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "posix-test", "posix-test\posix-test.vcxproj", "{D3738B06-0CF0-438F-856D-AA92B07F584E}"
 EndProject
 Global
@@ -293 +295 @@
                 {28761587-FE68-4AEB-8BF0-AB73484A0AD4}.Release|Win32.Build.0 = Release|Win32
                 {28761587-FE68-4AEB-8BF0-AB73484A0AD4}.Release|x64.ActiveCfg = Release|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Debug|Win32.ActiveCfg = Debug|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Debug|Win32.Build.0 = Debug|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Debug|x64.ActiveCfg = Debug|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Release|Win32.ActiveCfg = Release|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Release|Win32.Build.0 = Release|Win32
+                {D3738B06-0CF0-438F-856D-AA92B07F584E}.Release|x64.ActiveCfg = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

branches/windows-client/src/client/windows/client-test/test-io.c

@@ -422 +422 @@
     struct timeval start;
     double elapsed;
-    unsigned int *total = 0;
+    unsigned int *total;
     FILE *f;
 
@@ -449 +449 @@
         }
         elapsed = timer_elapsed(&start);
-        total += (unsigned int) (elapsed * 1000000.0);
+        *total += (unsigned int) (elapsed * 1000000.0);
 
         free(file_name);
@@ -455 +455 @@
 
     free(dir_name);
+
+    pthread_exit(total);
 
     return total;
@@ -464 +466 @@
     pthread_t *hthreads;
     int threadi, ret, i, code = 0;
-    unsigned int *counter, total;
+    unsigned int total;
+    void *counter;
     struct timeval start;
     double elapsed;
@@ -491 +494 @@
         for (i = 0; i < THREAD_COUNT && code == 0; i++)
         {
-            counter = (unsigned int *) malloc(sizeof(unsigned int));
-
             /* return value is time in microseconds */
-            code = pthread_join(hthreads[threadi], &counter);
-            total += *counter;
+            code = pthread_join(hthreads[i], &counter);            
+            total += *((unsigned int *) counter);
 
             free(counter);
@@ -526 +527 @@
     io_file_mt_cleanup(options);
 
-    free(counter);
     free(hthreads);
     free(args);

branches/windows-client/test/posix/open.c

@@ -5 +5 @@
  */
 #include <stdio.h>
+#ifdef WIN32
+#include <Windows.h>
+#include <io.h>
+#else
 #include <sys/time.h>
+#endif
 #include <string.h>
 #include <errno.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <sys/types.h>
@@ -14 +21 @@
 #include <fcntl.h>
 #include <time.h>
+#ifndef WIN32
 #include <linux/unistd.h>
 #include "sha1.h"
 #include "crc32c.h"
+#endif
 #include "mpi.h"
 
+#ifdef WIN32
+#define open(f, o, p)    _open(f, o, p)
+#define close(f)         _close(f)
+#define unlink(f)        _unlink(f)
+#endif
+
+#if 0
 static inline double msec_diff(double *end, double *begin)
 {
         return (*end - *begin);
 }
+#endif
 
+#ifdef WIN32
+static double Wtime(void)
+{
+    LARGE_INTEGER counter;
+
+    QueryPerformanceCounter(&counter);
+
+    return (double) counter.QuadPart;
+}
+#else
 static double Wtime(void)
 {
@@ -30 +57 @@
     return((double)t.tv_sec * 1e03 + (double)(t.tv_usec) * 1e-03);
 }
+#endif
 
+#if 0
 struct file_handle_generic {
         /* Filled by VFS */
@@ -39 +68 @@
         unsigned char fhg_hmac_sha1[24]; /* hmac-sha1 message authentication code */
 };
+#endif
 
 int main(int argc, char *argv[])
@@ -48 +78 @@
         int open_flags = 0;
         int i, rank, np;
+#ifdef WIN32
+        LARGE_INTEGER freq;
+        HANDLE hFile;
+#endif
 
         MPI_Init(&argc, &argv);
         MPI_Comm_rank(MPI_COMM_WORLD, &rank);
         MPI_Comm_size(MPI_COMM_WORLD, &np);
-
+#ifdef WIN32
+        /* just use one option for now */
+        fname = argv[1];
+        open_flags |= O_CREAT;
+        do_create = 1;
+#else
         while ((c = getopt(argc, argv, opt)) != EOF) {
                 switch (c) {
@@ -76 +115 @@
                 }
         }
+#endif
         if (fname == NULL)
         {
@@ -89 +129 @@
 
                         begin = Wtime();
+#ifdef WIN32
+                        hFile = CreateFile(fname,
+                                           GENERIC_READ | GENERIC_WRITE,
+                                           FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                                           NULL,
+                                           CREATE_ALWAYS,
+                                           FILE_ATTRIBUTE_NORMAL,
+                                           NULL);
+                        if (hFile == INVALID_HANDLE_VALUE)
+                        {
+                            fprintf(stderr, "CreateFile: %d\n", GetLastError());
+                            MPI_Finalize();
+                            exit(1);
+                        }
+#else
                         fd = open(fname, open_flags, 0775);
                         if (fd < 0) {
@@ -95 +150 @@
                                 exit(1);
                         }
+#endif
                         end = Wtime();
                         tdiff += (end - begin);
+#ifdef WIN32
+                        CloseHandle(hFile);
+#else
                         close(fd);
+#endif
                         if (rank == 0 && i < (niters - 1))
                                 unlink(fname);
         }
+        
+#ifdef WIN32
+        QueryPerformanceFrequency(&freq);
+        tdiff = tdiff / (double) freq.QuadPart * 1000.0;
+#endif
         tdiff = tdiff / niters;
         MPI_Allreduce(&tdiff, &max_diff, 1,