apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r584464 - /apr/apr/trunk/test/testlfs.c
Date Sun, 14 Oct 2007 01:08:58 GMT
Author: wrowe
Date: Sat Oct 13 18:08:57 2007
New Revision: 584464

URL: http://svn.apache.org/viewvc?rev=584464&view=rev
Log:
Introduce APR_FINFO_SPARSE apr_file_open() flag, and populate the
win32 behavior.  This flag may (AFAIK) be ignored for unix since
AIUI unix doesn't require anything special?

It is only necessary on Win32 to pass this flag once; but we need
to anticipate that other platforms special-handling of sparse may
require the apr_file_open() call subsequently to be aware that the
file is to be handled in this way.

FYI the style on testlfs is horrendous, but I only affected the
apr_file_open() changes required of this patch.  Why on earth
do we illustrate deprecated constants in our own test/s ???

Modified:
    apr/apr/trunk/test/testlfs.c

Modified: apr/apr/trunk/test/testlfs.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testlfs.c?rev=584464&r1=584463&r2=584464&view=diff
==============================================================================
--- apr/apr/trunk/test/testlfs.c (original)
+++ apr/apr/trunk/test/testlfs.c Sat Oct 13 18:08:57 2007
@@ -24,9 +24,10 @@
 #include "apr_mmap.h"
 #include "testutil.h"
 
-/* Only enable these tests by default on platforms which support sparse
+/* XXX: bullshit - this condition needs to be made a feature-detect.
+ * Only enable these tests by default on platforms which support sparse
  * files... just Unixes? */
-#if defined(WIN32) || defined(OS2) || defined(NETWARE)
+#if defined(OS2) || defined(NETWARE)
 static void test_nolfs(abts_case *tc, void *data)
 {
     ABTS_NOT_IMPL(tc, "Large Files tests require Sparse file support");
@@ -57,10 +58,10 @@
         APR_ASSERT_SUCCESS(tc, "make test directory", rv);
     }
 
-    APR_ASSERT_SUCCESS(tc, "open file",
-                       apr_file_open(&f, TESTFN, 
-                                     APR_CREATE | APR_WRITE | APR_TRUNCATE,
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&f, TESTFN, APR_FOPEN_CREATE | APR_FOPEN_WRITE
+                                 | APR_FOPEN_TRUNCATE | APR_FOPEN_SPARSE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open file", rv);
 
     rv = apr_file_trunc(f, eightGb);
 
@@ -86,11 +87,13 @@
 {
     apr_file_t *fh;
     apr_finfo_t finfo;
+    apr_status_t rv;
 
     PRECOND;
     
-    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file",
-                       apr_file_open(&fh, TESTFN, APR_READ, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file", rv);
 
     APR_ASSERT_SUCCESS(tc, "file_info_get failed",
                        apr_file_info_get(&finfo, APR_FINFO_NORM, fh));
@@ -126,7 +129,7 @@
     do {
         apr_finfo_t finfo;
         
-        rv = apr_dir_read(&finfo, APR_FINFO_NORM, dh);
+        rv = apr_dir_read(&finfo, APR_FINFO_MIN, dh);
         
         if (rv == APR_SUCCESS && strcmp(finfo.name, TESTFILE) == 0) {
             ABTS_ASSERT(tc, "apr_dir_read gave incorrect size for large file", 
@@ -149,12 +152,14 @@
 {
     apr_file_t *fh;
     apr_finfo_t finfo;
+    apr_status_t rv;
     
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "open 8Gb file for append",
-                       apr_file_open(&fh, TESTFN, APR_WRITE | APR_APPEND, 
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE 
+                                  | APR_FOPEN_APPEND, 
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8Gb file for append", rv);
 
     APR_ASSERT_SUCCESS(tc, "append to 8Gb file",
                        apr_file_write_full(fh, TESTSTR, strlen(TESTSTR), NULL));
@@ -172,12 +177,13 @@
 {
     apr_file_t *fh;
     apr_off_t pos;
+    apr_status_t rv;
 
     PRECOND;
     
-    APR_ASSERT_SUCCESS(tc, "open 8Gb file for writing",
-                       apr_file_open(&fh, TESTFN, APR_WRITE, 
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8Gb file for writing", rv);
 
     pos = 0;
     APR_ASSERT_SUCCESS(tc, "relative seek to end", 
@@ -199,11 +205,13 @@
 {
     apr_file_t *fh;
     apr_off_t pos = eightGb - 4;
+    apr_status_t rv;
 
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file",
-                       apr_file_open(&fh, TESTFN, APR_WRITE, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file", rv);
 
     APR_ASSERT_SUCCESS(tc, "seek to 8Gb - 4", 
                        apr_file_seek(fh, APR_SET, &pos));
@@ -223,12 +231,14 @@
     apr_file_t *fh;
     apr_size_t len = 16384; /* hopefully a multiple of the page size */
     apr_off_t off = eightGb - len; 
+    apr_status_t rv;
     void *ptr;
 
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "open 8gb file for mmap",
-                       apr_file_open(&fh, TESTFN, APR_READ, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8gb file for mmap", rv);
     
     APR_ASSERT_SUCCESS(tc, "mmap 8Gb file",
                        apr_mmap_create(&map, fh, off, len, APR_MMAP_READ, p));
@@ -265,14 +275,15 @@
 {
     apr_off_t off;
     apr_file_t *f;
+    apr_status_t rv;
 
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "open buffered file",
-                       apr_file_open(&f, TESTBUFFN,
-                                     APR_FOPEN_CREATE|APR_FOPEN_WRITE
-                                     |APR_FOPEN_TRUNCATE|APR_FOPEN_BUFFERED,
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&f, TESTBUFFN, APR_FOPEN_CREATE | APR_FOPEN_WRITE
+                                    | APR_FOPEN_TRUNCATE | APR_FOPEN_BUFFERED
+                                    | APR_FOPEN_SPARSE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open buffered file", rv);
 
     APR_ASSERT_SUCCESS(tc, "truncate to 8GB",
                        apr_file_trunc(f, eightGb));



Mime
View raw message