[xio-commit] CVS update: MODIFIED: test, http_performance_common.c, http_pingpong_test.c, http_put_test.c, http_throughput_test.c ...
Joe Bester
commit at globus.org
Wed Apr 30 13:53:42 CDT 2008
User: bester
Date: 08/04/30 13:53:42
Modified: test http_get_test.c http_header_test.c
http_performance_common.c http_performance_common.h
http_pingpong_test.c http_post_test.c
http_put_test.c http_test_common.c
http_throughput_test.c
Log:
Fix warnings on http tests.
Reduce default tcp buffer size for performance tests.
Revision Changes Path
1.12 +11 -10 xio/test/http_get_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_get_test.c.diff?r1=1.11&r2=1.12
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_get_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_get_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- http_get_test.c 21 Aug 2007 11:47:45 -0000 1.11
+++ http_get_test.c 30 Apr 2008 18:53:41 -0000 1.12
@@ -51,7 +51,7 @@
#include "http_test_common.h"
int done = 0;
-char * message_body;
+globus_byte_t * message_body;
long file_size;
globus_xio_http_version_t version = GLOBUS_XIO_HTTP_VERSION_UNSET;
size_t buffer_size = 0;
@@ -85,7 +85,7 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -93,7 +93,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -123,7 +123,7 @@
char content_length_buffer[64];
globus_xio_http_header_t headers[2];
globus_xio_data_descriptor_t descriptor;
- char buffer[1];
+ globus_byte_t buffer[1];
globus_xio_handle_t handle;
int status_code;
char * reason_phrase;
@@ -461,11 +461,11 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
- char * ptr = message;
+ globus_byte_t * ptr = message;
globus_size_t left = message_size;
globus_size_t to_write;
globus_size_t nbytes;
@@ -517,7 +517,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
@@ -526,7 +526,7 @@
globus_size_t to_read;
globus_size_t nbytes;
globus_result_t result = GLOBUS_SUCCESS;
- char * buffer;
+ globus_byte_t * buffer;
GlobusXIOName(globus_l_xio_test_read_buffer);
if (buffer_size == 0)
@@ -582,7 +582,8 @@
fprintf(stderr, "Error reading from http: %s\n",
globus_object_printable_to_string(globus_error_peek(result)));
- fprintf(stderr, "after reading %u of %u bytes\n", offset, message_size);
+ fprintf(stderr, "after reading %lu of %lu bytes\n",
+ (unsigned long) offset, (unsigned long) message_size);
}
return result;
@@ -619,7 +620,7 @@
break;
case 'c':
server = GLOBUS_FALSE;
- contact = gets(gets_buffer);
+ contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
1.10 +2 -2 xio/test/http_header_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_header_test.c.diff?r1=1.9&r2=1.10
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_header_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_header_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- http_header_test.c 19 Jan 2006 05:57:52 -0000 1.9
+++ http_header_test.c 30 Apr 2008 18:53:41 -0000 1.10
@@ -142,7 +142,7 @@
int status_code;
char * reason_phrase;
globus_xio_data_descriptor_t descriptor;
- char buffer[1];
+ globus_byte_t buffer[1];
globus_hashtable_t headers;
rc = read_test_file(filename);
@@ -497,7 +497,7 @@
break;
case 'c':
server = GLOBUS_FALSE;
- contact = gets(gets_buffer);
+ contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
1.7 +3 -2 xio/test/http_performance_common.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_performance_common.c.diff?r1=1.6&r2=1.7
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_performance_common.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_performance_common.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- http_performance_common.c 19 Jan 2006 05:57:52 -0000 1.6
+++ http_performance_common.c 30 Apr 2008 18:53:41 -0000 1.7
@@ -537,7 +537,7 @@
void * user_arg)
{
http_test_server_t * test_server = user_arg;
- char buffer[1];
+ globus_byte_t buffer[1];
/* Processing is done in the request callback */
result = globus_xio_register_read(
@@ -863,7 +863,8 @@
latency = burp_time/(info->iterations * 2.0);
bw = info->size/(latency * 2.0);
bw = bw / (1024.0 * 1024.0);
- sprintf(namebuf, "%s-%d-%lf-%lf", perf->name, info->size, latency, bw);
+ sprintf(namebuf, "%s-%lu-%lf-%lf", perf->name,
+ (unsigned long) info->size, latency, bw);
globus_utp_name_timer(timer, namebuf);
info->size = perf->next_size(info->size);
1.6 +1 -1 xio/test/http_performance_common.h
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_performance_common.h.diff?r1=1.5&r2=1.6
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_performance_common.h
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_performance_common.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- http_performance_common.h 19 Jan 2006 05:57:52 -0000 1.5
+++ http_performance_common.h 30 Apr 2008 18:53:41 -0000 1.6
@@ -23,7 +23,7 @@
#define PINGPONG_MAX_SIZE 1000000
#define THROUGHPUT_MAX_SIZE 1000000
#define START_SIZE 1000000
-#define TCP_BUF_SIZE 8000000
+#define TCP_BUF_SIZE 80000
typedef struct
{
1.7 +5 -4 xio/test/http_pingpong_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_pingpong_test.c.diff?r1=1.6&r2=1.7
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_pingpong_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_pingpong_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- http_pingpong_test.c 19 Jan 2006 05:57:52 -0000 1.6
+++ http_pingpong_test.c 30 Apr 2008 18:53:41 -0000 1.7
@@ -106,7 +106,7 @@
globus_xio_handle_t handle;
int i;
globus_xio_data_descriptor_t descriptor;
- char buffer[1];
+ globus_byte_t buffer[1];
int status_code;
char * reason_phrase;
globus_utp_start_timer(timer);
@@ -123,7 +123,7 @@
((info->transfer_encoding != NULL)
&& strcmp(info->transfer_encoding, IDENTITY) == 0))
{
- sprintf(content_length_buffer, "%d", info->size);
+ sprintf(content_length_buffer, "%lu", (unsigned long) info->size);
headers[header_cnt].name = "Content-Length";
headers[header_cnt].value = &content_length_buffer[0];
@@ -334,7 +334,8 @@
((info->transfer_encoding != NULL)
&& strcmp(info->transfer_encoding, IDENTITY) == 0))
{
- sprintf(content_length_buffer, "%d", info->size);
+ sprintf(content_length_buffer, "%lu",
+ (unsigned long) info->size);
response_headers[header_cnt].name = "Content-Length";
response_headers[header_cnt].value = &content_length_buffer[0];
@@ -526,7 +527,7 @@
exit(0);
case 'c':
server = GLOBUS_FALSE;
- info->contact = gets(gets_buffer);
+ info->contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
1.14 +13 -12 xio/test/http_post_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_post_test.c.diff?r1=1.13&r2=1.14
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_post_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_post_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- http_post_test.c 21 Aug 2007 11:47:45 -0000 1.13
+++ http_post_test.c 30 Apr 2008 18:53:41 -0000 1.14
@@ -54,7 +54,7 @@
#include "http_test_common.h"
int done = 0;
-char * message_body;
+globus_byte_t * message_body;
long file_size;
globus_xio_http_version_t version = GLOBUS_XIO_HTTP_VERSION_UNSET;
size_t buffer_size = 0;
@@ -89,7 +89,7 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -97,7 +97,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -130,7 +130,7 @@
globus_xio_handle_t handle;
int i;
globus_xio_data_descriptor_t descriptor;
- char buffer[1];
+ globus_byte_t buffer[1];
int status_code;
char * reason_phrase;
@@ -479,7 +479,7 @@
}
rewind(fp);
- message_body = globus_libc_malloc(file_size+1);
+ message_body = malloc(file_size+1);
if (message_body == NULL)
{
rc = 38;
@@ -512,11 +512,11 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
- char * ptr = message;
+ globus_byte_t * ptr = message;
globus_size_t left = message_size;
globus_size_t to_write;
globus_size_t nbytes;
@@ -568,7 +568,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
@@ -577,7 +577,7 @@
globus_size_t to_read;
globus_size_t nbytes;
globus_result_t result = GLOBUS_SUCCESS;
- char * buffer;
+ globus_byte_t * buffer;
GlobusXIOName(globus_l_xio_test_read_buffer);
if (buffer_size == 0)
@@ -585,7 +585,7 @@
buffer_size = 1024;
}
- buffer = globus_libc_malloc(buffer_size);
+ buffer = malloc(buffer_size);
if (buffer == NULL)
{
@@ -633,7 +633,8 @@
fprintf(stderr, "Error reading from http: %s\n",
globus_object_printable_to_string(globus_error_peek(result)));
- fprintf(stderr, "after reading %u of %u bytes\n", offset, message_size);
+ fprintf(stderr, "after reading %lu of %lu bytes\n",
+ (unsigned long) offset, (unsigned long) message_size);
}
return result;
@@ -670,7 +671,7 @@
break;
case 'c':
server = GLOBUS_FALSE;
- contact = gets(gets_buffer);
+ contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
1.12 +11 -10 xio/test/http_put_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_put_test.c.diff?r1=1.11&r2=1.12
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_put_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_put_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- http_put_test.c 21 Aug 2007 11:47:45 -0000 1.11
+++ http_put_test.c 30 Apr 2008 18:53:41 -0000 1.12
@@ -52,7 +52,7 @@
#include "http_test_common.h"
int done = 0;
-char * message_body;
+globus_byte_t * message_body;
long file_size;
globus_xio_http_version_t version = GLOBUS_XIO_HTTP_VERSION_UNSET;
size_t buffer_size = 0;
@@ -86,7 +86,7 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -94,7 +94,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size);
@@ -124,7 +124,7 @@
char content_length_buffer[64];
globus_xio_http_header_t headers[2];
globus_xio_data_descriptor_t descriptor;
- char buffer[1];
+ globus_byte_t buffer[1];
globus_xio_handle_t handle;
int status_code;
char * reason_phrase;
@@ -430,11 +430,11 @@
globus_result_t
globus_l_xio_test_write_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
- char * ptr = message;
+ globus_byte_t * ptr = message;
globus_size_t left = message_size;
globus_size_t to_write;
globus_size_t nbytes;
@@ -486,7 +486,7 @@
globus_result_t
globus_l_xio_test_read_buffer(
globus_xio_handle_t handle,
- char * message,
+ globus_byte_t * message,
globus_size_t message_size,
globus_size_t buffer_size)
{
@@ -495,7 +495,7 @@
globus_size_t to_read;
globus_size_t nbytes;
globus_result_t result = GLOBUS_SUCCESS;
- char * buffer;
+ globus_byte_t * buffer;
GlobusXIOName(globus_l_xio_test_read_buffer);
if (buffer_size == 0)
@@ -551,7 +551,8 @@
fprintf(stderr, "Error reading from http: %s\n",
globus_object_printable_to_string(globus_error_peek(result)));
- fprintf(stderr, "after reading %u of %u bytes\n", offset, message_size);
+ fprintf(stderr, "after reading %lu of %lu bytes\n",
+ (unsigned long) offset, (unsigned long) message_size);
}
return result;
@@ -588,7 +589,7 @@
break;
case 'c':
server = GLOBUS_FALSE;
- contact = gets(gets_buffer);
+ contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
1.10 +1 -1 xio/test/http_test_common.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_test_common.c.diff?r1=1.9&r2=1.10
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_test_common.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_test_common.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- http_test_common.c 21 Aug 2007 11:47:45 -0000 1.9
+++ http_test_common.c 30 Apr 2008 18:53:41 -0000 1.10
@@ -512,7 +512,7 @@
void * user_arg)
{
http_test_server_t * test_server = user_arg;
- static char buffer[1];
+ static globus_byte_t buffer[1];
globus_assert(result == GLOBUS_SUCCESS);
result = globus_xio_register_read(
1.7 +5 -6 xio/test/http_throughput_test.c
http://viewcvs.globus.org/viewcvs.cgi/xio/test/http_throughput_test.c.diff?r1=1.6&r2=1.7
(In the diff below, changes in quantity of whitespace are not shown.)
Index: http_throughput_test.c
===================================================================
RCS file: /home/globdev/CVS/globus-packages/xio/test/http_throughput_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- http_throughput_test.c 19 Jan 2006 05:57:52 -0000 1.6
+++ http_throughput_test.c 30 Apr 2008 18:53:41 -0000 1.7
@@ -89,7 +89,7 @@
globus_xio_http_header_t headers[2];
globus_xio_handle_t handle;
int i;
- int nbytes;
+ size_t nbytes;
globus_xio_data_descriptor_t descriptor;
int status_code;
char * reason_phrase;
@@ -109,7 +109,7 @@
((info->transfer_encoding != NULL)
&& strcmp(info->transfer_encoding, IDENTITY) == 0))
{
- sprintf(content_length_buffer, "%d", info->size);
+ sprintf(content_length_buffer, "%lu", (unsigned long) info->size);
headers[header_cnt].name = "Content-Length";
headers[header_cnt].value = &content_length_buffer[0];
@@ -298,7 +298,7 @@
char content_length_buffer[64];
int rc=0;
int i;
- int nbytes;
+ size_t nbytes;
test_server = (http_test_server_t*) user_arg;
info = test_server->info;
@@ -357,7 +357,7 @@
((info->transfer_encoding != NULL)
&& strcmp(info->transfer_encoding, IDENTITY) == 0))
{
- sprintf(content_length_buffer, "%d", info->size);
+ sprintf(content_length_buffer, "%lu", (unsigned long) info->size);
response_headers[header_cnt].name = "Content-Length";
response_headers[header_cnt].value = &content_length_buffer[0];
@@ -445,7 +445,7 @@
exit(0);
case 'c':
server = GLOBUS_FALSE;
- info->contact = gets(gets_buffer);
+ info->contact = fgets(gets_buffer, sizeof(gets_buffer), stdin);
break;
case 's':
server = GLOBUS_TRUE;
@@ -552,7 +552,6 @@
performance_write_timers(&perf);
}
-cleanup_exit:
globus_xio_stack_destroy(info->stack);
globus_xio_driver_unload(info->tcp_driver);
globus_xio_driver_unload(info->http_driver);
More information about the xio-commit
mailing list