Changeset 911

Timestamp:

01/09/2006 08:48:12 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/test/backupdiff/testbackupdiff.cpp (modified) (10 diffs)

box/chris/merge/test/backupdiff/testbackupdiff.cpp

@@ -67 +67 @@
 void make_file_of_zeros(const char *filename, size_t size)
 {
-        #ifdef WIN32
-        HANDLE handle = openfile(filename, O_WRONLY | O_CREAT | O_EXCL, 0);
-        TEST_THAT(handle != INVALID_HANDLE_VALUE);
-        SetFilePointer(handle, size, NULL, FILE_BEGIN);
-        TEST_THAT(GetLastError() == NO_ERROR);
-        TEST_THAT(SetEndOfFile(handle) == true);
-        TEST_THAT(CloseHandle(handle)  == true);
-        #else
-        int fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0600);
-        if (fd < 0) perror(filename);
-        TEST_THAT(fd >= 0);
-        TEST_THAT(ftruncate(fd, size) == 0);
-        TEST_THAT(close(fd) == 0);
-        #endif
+        static const size_t bs = 0x10000;
+        size_t remSize = size;
+        void *b = malloc(bs);
+        memset(b, 0, bs);
+        FILE *f = fopen(filename, "wb");
+
+        // Using largish blocks like this is much faster, while not consuming too much RAM
+        while(remSize > bs)
+        {
+                fwrite(b, bs, 1, f);
+                remSize -= bs;
+        }
+        fwrite(b, remSize, 1, f);
+
+        fclose(f);
+        free(b);
 
         TEST_THAT((size_t)TestGetFileSize(filename) == size);
@@ -117 +119 @@
                 {
                         nnew++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d this  s=%8I64d", b, s);
-                        #else
                         TRACE2("%8lld this  s=%8lld", b, s);
-                        #endif
                 }
                 else
                 {
                         nold++;
-                        #ifdef WIN32
-                        TRACE2("%8I64d other i=%8I64d", b, 0 - s);              
-                        #else
                         TRACE2("%8lld other i=%8lld", b, 0 - s);                
-                        #endif
                 }
                 // Decode the rest
@@ -214 +208 @@
         else
         {
-#ifdef WIN32
-                // Emulate the above stage!
-                char src[256], dst[256];
-                sprintf(src, "testfiles\\f%d.diff", to);
-                sprintf(dst, "testfiles\\f%d.encoded", to);
-                TEST_THAT(CopyFile(src, dst, FALSE) != 0)
-#else
                 // Emulate the above stage!
                 char cmd[256];
                 sprintf(cmd, "cp testfiles/f%d.diff testfiles/f%d.encoded", to, to);
                 ::system(cmd);
-#endif
         }
 
@@ -370 +356 @@
         // Want to trace out all the details
         #ifndef NDEBUG
-        #ifndef WIN32
         BackupStoreFile::TraceDetailsOfDiffProcess = true;
-        #endif
         #endif
 
@@ -387 +371 @@
                 std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/f0", 1 /* dir ID */, f0name));
                 encoded->CopyStreamTo(out);
-                out.Close();
                 check_encoded_file("testfiles/f0.encoded", 0, 33, 0);
         }
@@ -448 +431 @@
                         std::auto_ptr<IOStream> encoded(BackupStoreFile::EncodeFile("testfiles/f9", 1 /* dir ID */, fn));
                         encoded->CopyStreamTo(out);
-                        out.Close();
                         check_encoded_file("testfiles/f9.zerotest", 0, 0, 0);           
                 }
@@ -459 +441 @@
         }
         
-#ifndef WIN32   
         // Check that symlinks aren't diffed
         TEST_THAT(::symlink("f2", "testfiles/f2.symlink") == 0)
@@ -487 +468 @@
                 check_encoded_file("testfiles/f2.symlink.diff", 0, 0, 0);               
         }
-#endif
-
-        // Check that diffing against a file which isn't "complete" and 
-        // references another isn't allowed
+
+        // Check that diffing against a file which isn't "complete" and referes another isn't allowed
         {
                 FileStream blockindex("testfiles/f1.diff");
@@ -502 +481 @@
         }
 
-        // Found a nasty case where files of lots of the same thing 
-        // suck up lots of processor time -- because of lots of matches 
-        // found. Check this out!
-
-        #ifdef WIN32
-        ::fprintf(stdout, "Testing diffing two large streams, "
-                "may take a while!\n");
-        ::fflush(stdout);
-        #endif
-
+        // Found a nasty case where files of lots of the same thing sock up lots of processor
+        // time -- because of lots of matches found. Check this out!
         make_file_of_zeros("testfiles/zero.0", 20*1024*1024);
         make_file_of_zeros("testfiles/zero.1", 200*1024*1024);
-
         // Generate a first encoded file
         {
@@ -534 +504 @@
                         0, 0));
                 encoded->CopyStreamTo(out);
-
-                printf("Time taken: %d seconds\n", (int)(time(0) - beginTime));
-
-                #ifdef WIN32
-                TEST_THAT(time(0) < (beginTime + 300));
-                #else
                 TEST_THAT(time(0) < (beginTime + 40));
-                #endif
         }
         // Remove zero-files to save disk space