aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-04-22 12:40:05 +0000
committerYang Tse <yangsita@gmail.com>2008-04-22 12:40:05 +0000
commit95fd093c4a49aca1015e178a5c08ca9dd9234bef (patch)
tree6c4a757dc648b1a633250f697f7d8167cee93a3e
parented1ad28e2988aa79682eb9317e64c999137e20d7 (diff)
Remove fflush() + fsync() previously introduced accelerated writing of
server input and response request files of the test harness sws server. Reintroduce, for test # 1001, the <postcheck> small delay. The delay is needed even with the accelerated writing of server input and response request files in test harness sws server. http://curl.haxx.se/mail/lib-2008-04/0385.html
-rw-r--r--configure.ac2
-rw-r--r--lib/config-win32.h6
-rw-r--r--lib/config-win32ce.h8
-rw-r--r--src/config-win32.h6
-rw-r--r--tests/data/test10013
-rw-r--r--tests/server/sws.c36
6 files changed, 3 insertions, 58 deletions
diff --git a/configure.ac b/configure.ac
index 40e4da61b..d9ba94ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2000,8 +2000,6 @@ AC_CHECK_FUNCS( strtoll \
strcasecmp \
stricmp \
strcmpi \
- fflush \
- fsync \
gethostbyaddr \
gettimeofday \
inet_addr \
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 73ac8a08e..031eda54a 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -136,12 +136,6 @@
/* Define if you don't have vprintf but do have _doprnt. */
/* #define HAVE_DOPRNT 1 */
-/* Define if you have the fflush function. */
-#define HAVE_FFLUSH 1
-
-/* Define if you have the fsync function. */
-/* #define HAVE_FSYNC 1 */
-
/* Define if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1
diff --git a/lib/config-win32ce.h b/lib/config-win32ce.h
index 715f1c3e6..6c0fb411f 100644
--- a/lib/config-win32ce.h
+++ b/lib/config-win32ce.h
@@ -127,14 +127,6 @@
/* Define if you don't have vprintf but do have _doprnt. */
/* #define HAVE_DOPRNT 1 */
-/* Define if you have the fflush function. */
-#if defined(_WIN32_WCE) && (_WIN32_WCE >= 200)
-# define HAVE_FFLUSH 1
-#endif
-
-/* Define if you have the fsync function. */
-/* #define HAVE_FSYNC 1 */
-
/* Define if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1
diff --git a/src/config-win32.h b/src/config-win32.h
index 92be57479..6aaac0032 100644
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -75,12 +75,6 @@
/* Define if you have the setmode function. */
#define HAVE_SETMODE 1
-/* Define if you have the fflush function. */
-#define HAVE_FFLUSH 1
-
-/* Define if you have the fsync function. */
-/* #define HAVE_FSYNC 1 */
-
/* Define if you have the ftruncate function. */
#define HAVE_FTRUNCATE 1
diff --git a/tests/data/test1001 b/tests/data/test1001
index 9f8e53432..58832cbdf 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -71,6 +71,9 @@ http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x http://%
<file name="log/1001">
test
</file>
+<postcheck>
+%SRCDIR/libtest/delay.pl 1
+</postcheck>
</client>
# Verify data after the test has been "shot"
diff --git a/tests/server/sws.c b/tests/server/sws.c
index b7c950324..41bac4f01 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -512,24 +512,6 @@ void storerequest(char *reqbuf, ssize_t totalsize)
totalsize-writeleft, totalsize, REQUEST_DUMP);
}
-#ifdef HAVE_FFLUSH
- do {
- res = fflush(dump);
- } while(res && ((error = ERRNO) == EINTR));
- if(res)
- logmsg("Error flushing file %s error: %d %s",
- REQUEST_DUMP, error, strerror(error));
-#endif
-
-#ifdef HAVE_FSYNC
- do {
- res = fsync(fileno(dump));
- } while(res && ((error = ERRNO) == EINTR));
- if(res)
- logmsg("Error syncing file %s error: %d %s",
- REQUEST_DUMP, error, strerror(error));
-#endif
-
do {
res = fclose(dump);
} while(res && ((error = ERRNO) == EINTR));
@@ -800,24 +782,6 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
buffer += written;
} while(count>0);
-#ifdef HAVE_FFLUSH
- do {
- res = fflush(dump);
- } while(res && ((error = ERRNO) == EINTR));
- if(res)
- logmsg("Error flushing file %s error: %d %s",
- RESPONSE_DUMP, error, strerror(error));
-#endif
-
-#ifdef HAVE_FSYNC
- do {
- res = fsync(fileno(dump));
- } while(res && ((error = ERRNO) == EINTR));
- if(res)
- logmsg("Error syncing file %s error: %d %s",
- RESPONSE_DUMP, error, strerror(error));
-#endif
-
do {
res = fclose(dump);
} while(res && ((error = ERRNO) == EINTR));