generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove fflush() + fsync() previously introduced accelerated writing of

Browse Source 
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
This commit is contained in:
Yang Tse
2008-04-22 12:40:05 +00:00
parent ed1ad28e29
commit 95fd093c4a
6 changed files with 3 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -2000,8 +2000,6 @@ AC_CHECK_FUNCS( strtoll \
strcasecmp \ strcasecmp \
stricmp \ stricmp \
strcmpi \ strcmpi \
fflush \
fsync \
gethostbyaddr \ gethostbyaddr \
gettimeofday \ gettimeofday \
inet_addr \ inet_addr \

6
lib/config-win32.h
View File

@@ -136,12 +136,6 @@
/* Define if you don't have vprintf but do have _doprnt. */ /* Define if you don't have vprintf but do have _doprnt. */
/* #define HAVE_DOPRNT 1 */ /* #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 if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1 #define HAVE_GETHOSTBYADDR 1

8
lib/config-win32ce.h
View File

@@ -127,14 +127,6 @@
/* Define if you don't have vprintf but do have _doprnt. */ /* Define if you don't have vprintf but do have _doprnt. */
/* #define HAVE_DOPRNT 1 */ /* #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 if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1 #define HAVE_GETHOSTBYADDR 1

6
src/config-win32.h
View File

@@ -75,12 +75,6 @@
/* Define if you have the setmode function. */ /* Define if you have the setmode function. */
#define HAVE_SETMODE 1 #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 if you have the ftruncate function. */
#define HAVE_FTRUNCATE 1 #define HAVE_FTRUNCATE 1

3
tests/data/test1001
View File

@@ -71,6 +71,9 @@ http://%HOSTIP:%HTTPPORT/1001 -u auser:apasswd --digest -T log/1001 -x http://%
<file name="log/1001"> <file name="log/1001">
test test
</file> </file>
<postcheck>
%SRCDIR/libtest/delay.pl 1
</postcheck>
</client> </client>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"

36
tests/server/sws.c
View File

@@ -512,24 +512,6 @@ void storerequest(char *reqbuf, ssize_t totalsize)
totalsize-writeleft, totalsize, REQUEST_DUMP); 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 { do {
res = fclose(dump); res = fclose(dump);
} while(res && ((error = ERRNO) == EINTR)); } while(res && ((error = ERRNO) == EINTR));
@@ -800,24 +782,6 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
buffer += written; buffer += written;
} while(count>0); } 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 { do {
res = fclose(dump); res = fclose(dump);
} while(res && ((error = ERRNO) == EINTR)); } while(res && ((error = ERRNO) == EINTR));