Re: Some changes to curl-loader
Status: Alpha
Brought to you by:
coroberti
Menu
▾
▴
Re: Some changes to curl-loader
|
From: Val S. <va...@nv...> - 2009-08-14 20:11:29
|
diff -ur curl-loader/batch.h curl-loader.564+0.48.vs1/batch.h
--- curl-loader/batch.h 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/batch.h 2009-08-13 12:00:01.000000000 -0700
@@ -82,6 +82,9 @@
/* Statistics file <batch-name>.txt */
char batch_statistics[BATCH_NAME_SIZE+BATCH_NAME_EXTRA_SIZE];
+ /* Operational statistics file <batch-name>.ops */
+ char batch_opstats[BATCH_NAME_SIZE+BATCH_NAME_EXTRA_SIZE];
+
/* Maximum number of clients (each client with its own IP-address) in the batch */
int client_num_max;
@@ -135,10 +138,15 @@
/*
Number of cycles to repeat the urls downloads and afterwards sleeping
- cycles. Zero means run it forever.
+ cycles. Zero means run it until time to run is exhausted.
*/
long cycles_num;
+ /*
+ Time to run in msec. Zero means time to run is infinite.
+ */
+ unsigned long run_time;
+
/*
User-agent string to appear in the HTTP 1/1 requests.
*/
@@ -247,6 +255,12 @@
/* The file to be used for statistics output */
FILE* statistics_file;
+ /* The file to be used for operational statistics output */
+ FILE* opstats_file;
+
+ /* Dump operational statistics indicator, 0: no dump */
+ int dump_opstats;
+
/* Timestamp, when the loading started */
unsigned long start_time;
@@ -267,6 +281,10 @@
op_stat_point op_delta;
op_stat_point op_total;
+ /* Count of response times dumped before new-line,
+ used to limit line length */
+ int ct_resps;
+
} batch_context;
diff -ur curl-loader/ChangeLog curl-loader.564+0.48.vs1/ChangeLog
--- curl-loader/ChangeLog 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/ChangeLog 2009-08-13 12:48:14.000000000 -0700
@@ -1,3 +1,9 @@
+Val Shkolnikov, June 21, 2009.
+
+* Directed operational statistics into a file with the extension .ops
+* Added DUMP_OPSTATS and RUN_TIME options.
+* Added time stamp to the .log file, streamlined logging using macros.
+* Added a second -v option for varied level of logging detail.
* Renamed function getline to get_line since folks from RedHat are
polluting the namespace. Thanks to jari pietila <jar...@ho...>
diff -ur curl-loader/conf.c curl-loader.564+0.48.vs1/conf.c
--- curl-loader/conf.c 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/conf.c 2009-08-13 12:00:01.000000000 -0700
@@ -176,8 +176,8 @@
}
break;
- case 'v':
- verbose_logging = 1;
+ case 'v': /* accumulate verbosity */
+ verbose_logging += 1;
break;
case 'u':
diff -ur curl-loader/doc/curl-loader.1 curl-loader.564+0.48.vs1/doc/curl-loader.1
--- curl-loader/doc/curl-loader.1 2009-08-09 13:27:20.000000000 -0700
+++ curl-loader.564+0.48.vs1/doc/curl-loader.1 2009-08-13 11:59:57.000000000 -0700
@@ -87,8 +87,9 @@
logical CPUs as seen by cat /proc/cpuinfo.
.TP
.B "\-v"
-Request more verbose output to the log files, including information about
-the headers sent and received. In some cases\-d option is a more informative.
+Request more verbose output to the log files. If used twice, include
+information about
+the headers sent and received. In some cases \-d option is a more informative.
.TP
.B "\-u"
Activate logging of URLs to the log file, when the \-v verbose option is used.
diff -ur curl-loader/doc/curl-loader-config.5 curl-loader.564+0.48.vs1/doc/curl-loader-config.5
--- curl-loader/doc/curl-loader-config.5 2009-08-09 13:27:20.000000000 -0700
+++ curl-loader.564+0.48.vs1/doc/curl-loader-config.5 2009-08-13 11:59:57.000000000 -0700
@@ -182,10 +182,10 @@
.TP
.B CYCLES_NUM
This requires a valid signed integer value. This is the number of
-cycles to be performed. If the value is -1, the
+cycles to be performed. If the value is negative or 0, the
.B curl\-loader
-tool cycles forever until you hit ctl-C. This is a tag for the
-general section.
+tool cycles forever until the run time is exhausted or you hit ctl-C.
+This is a tag for the general section.
.TP
.B USER_AGENT
This requires a valid quoted string value. This is a way to override the
@@ -194,6 +194,20 @@
.B HEADER
tag. This is a tag for the general section.
.TP
+.B DUMP_OPSTATS
+This requires a value of "yes" or "no". The operational statistics file
+with the extension ".ops" is generated if the value is "yes" (the default)
+and is not generated otherwise.
+This is a tag for the general section.
+.TP
+.B RUN_TIME
+This requires a value combined of up to 4 numbers separated with a colon, as
+in D:H:M:S, H:M:S, M:S or S. Here D is days, H is hours, M is minutes
+and S is seconds. The value specifies maximum run time of the curl-loader.
+If the value is negative or 0, the curl-loader runs until the number of
+cycles to be performed is exhausted or you hit ctl-C.
+This is a tag for the general section.
+.TP
.B URLS_NUM
This requires a valid unsigned integer value. This is the number of
URLs in the URL section. This is a tag for the general section.
@@ -663,4 +677,4 @@
/usr/share/doc/curl-loader/conf-examples/* for configuration examples
.br
.SH "SEE ALSO"
-.BR curl\-loader (8)
+.BR curl\-loader (1)
diff -ur curl-loader/loader.c curl-loader.564+0.48.vs1/loader.c
--- curl-loader/loader.c 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/loader.c 2009-08-13 12:50:13.000000000 -0700
@@ -48,7 +48,6 @@
#include <curl/multi.h>
// getrlimit
-#include <sys/time.h>
#include <sys/resource.h>
#include "batch.h"
@@ -118,6 +117,14 @@
user_activity_smooth
};
+static FILE *create_file (batch_context* bctx, char* fname)
+{
+ FILE *fp = fopen(fname,"w");
+ if (!fp)
+ (void)fprintf(stderr,"%s, cannot create file \"%s\", %s\n",
+ bctx->batch_name,fname,strerror(errno));
+ return fp;
+}
int
main (int argc, char *argv [])
@@ -258,6 +265,7 @@
batch_context* bctx = (batch_context *) batch_data;
FILE* log_file = 0;
FILE* statistics_file = 0;
+ FILE* opstats_file = 0;
int rval = -1;
@@ -273,34 +281,38 @@
/*
Init batch logfile for the batch client output
*/
- sprintf (bctx-> batch_logfile, "./%s.log", bctx->batch_name);
-
- if (!(log_file = fopen(bctx-> batch_logfile, "w")))
- {
- fprintf (stderr,
- "%s - \"%s\" - failed to open file \"%s\" with errno %d.\n",
- __func__, bctx->batch_name, bctx-> batch_logfile, errno);
+ (void)sprintf (bctx-> batch_logfile, "./%s.log", bctx->batch_name);
+ if (!(log_file = create_file(bctx,bctx->batch_logfile)))
return NULL;
+ else
+ {
+ char tbuf[256];
+ (void)fprintf(log_file,"# %ld %s",get_tick_count(),ascii_time(tbuf));
+ (void)fprintf(log_file,
+ "# msec_offset cycle_no url_no client_no (ip) indic info\n");
}
}
/*
Init batch statistics file
*/
- sprintf (bctx->batch_statistics, "./%s.txt", bctx->batch_name);
-
- if (!(statistics_file = fopen(bctx->batch_statistics, "w")))
- {
- fprintf (stderr,
- "%s - \"%s\" - failed to open file \"%s\" with errno %d.\n",
- __func__, bctx->batch_name, bctx->batch_statistics, errno);
+ (void)sprintf (bctx->batch_statistics, "./%s.txt", bctx->batch_name);
+ if (!(bctx->statistics_file = statistics_file = create_file(bctx,
+ bctx->batch_statistics)))
return NULL;
- }
else
- {
- bctx->statistics_file = statistics_file;
print_statistics_header (statistics_file);
- }
+
+ /*
+ Init batch operational statistics file
+ */
+ if (bctx->dump_opstats)
+ {
+ (void)sprintf (bctx->batch_opstats, "./%s.ops", bctx->batch_name);
+ if (!(bctx->opstats_file = opstats_file = create_file(bctx,
+ bctx->batch_opstats)))
+ return NULL;
+ }
/*
Init the objects, containing client-context information.
@@ -349,6 +361,9 @@
if (statistics_file)
fclose (statistics_file);
+ if (opstats_file)
+ fclose (opstats_file);
+
free_batch_data_allocations (bctx);
return NULL;
@@ -879,8 +894,8 @@
snprintf (body_file, sizeof (body_file) -1,
"%s/cl-%Zu-cycle-%ld.body",
url->dir_log,
- cctx->client_index,
- cctx->cycle_num
+ (unsigned)cctx->client_index,
+ (unsigned long)cctx->cycle_num
);
if (cctx->logfile_bodies)
@@ -909,8 +924,8 @@
snprintf (hdr_file, sizeof (hdr_file) -1,
"%s/cl-%Zu-cycle-%ld.hdr",
url->dir_log,
- cctx->client_index,
- cctx->cycle_num
+ (unsigned)cctx->client_index,
+ (unsigned long)cctx->cycle_num
);
if (cctx->logfile_headers)
@@ -1108,6 +1123,36 @@
return 0;
}
+#define write_log(ind, data) \
+ if (1) {\
+ char *end = data+strlen(data)-1;\
+ if (*end == '\n')\
+ *end = '\0';\
+ (void)fprintf(cctx->file_output,"%ld %ld %ld %s%s %s",\
+ offs_resp, cctx->cycle_num, cctx->url_curr_index, cctx->client_name,\
+ ind, data);\
+ if (url_print)\
+ (void)fprintf(cctx->file_output," eff-url: url %s",url);\
+ if (url_diff)\
+ (void)fprintf(cctx->file_output," url: url %s",url_target);\
+ (void)fprintf(cctx->file_output,"\n");\
+ }
+
+#define write_log_num(ind, num) \
+ if (1) {\
+ char buf[100];\
+ (void)snprintf(buf,sizeof(buf),"%ld",num);\
+ write_log(ind,buf);\
+ }
+
+#define write_log_ext(ind, num, ext) \
+ if (1) {\
+ char buf[200];\
+ (void)snprintf(buf,sizeof(buf),"%ld %s",num, ext);\
+ write_log(ind,buf);\
+ }
+
+#define startswith(str, start) !strncmp((char *)str,(char *)start,strlen((char *)start))
/****************************************************************************************
* Function name - client_tracing_function
@@ -1172,19 +1217,20 @@
*/
scan_response(type, (char*) data, size, cctx);
+ const unsigned long time_resp = get_tick_count();
+ const unsigned long offs_resp = time_resp - cctx->bctx->start_time;
+
switch (type)
{
case CURLINFO_TEXT:
if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s :== Info: %s: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, data,
- url_print ? url : "", url_diff ? url_target : "");
+ if (verbose_logging > 1 || startswith(data,"About") ||
+ startswith(data,"Closing"))
+ write_log("==",(char *)data);
break;
case CURLINFO_ERROR:
- fprintf(cctx->file_output, "%ld %s !! ERROR: %s: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, data,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log("!! ERR",(char *)data);
cctx->client_state = CSTATE_ERROR;
@@ -1193,9 +1239,8 @@
break;
case CURLINFO_HEADER_OUT:
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s => Send header: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, url_print ? url : "", url_diff ? url_target : "");
+ if (verbose_logging > 1)
+ write_log("=>","Send header");
stat_data_out_add (cctx, (unsigned long) size);
@@ -1204,26 +1249,21 @@
/* First header of the HTTP-request. */
first_hdr_req_inc (cctx);
stat_req_inc (cctx); /* Increment number of requests */
- cctx->req_sent_timestamp = get_tick_count ();
}
first_hdrs_clear_non_req (cctx);
break;
case CURLINFO_DATA_OUT:
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s => Send data: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, url_print ? url : "",
- url_diff ? url_target : "");
+ if (verbose_logging > 1)
+ write_log("=>","Send data");
stat_data_out_add (cctx, (unsigned long) size);
first_hdrs_clear_all (cctx);
break;
case CURLINFO_SSL_DATA_OUT:
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s => Send ssl data: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, url_print ? url : "",
- url_diff ? url_target : "");
+ if (verbose_logging > 1)
+ write_log("=>","Send ssl data");
stat_data_out_add (cctx, (unsigned long) size);
first_hdrs_clear_all (cctx);
@@ -1241,10 +1281,8 @@
curl_easy_getinfo (handle, CURLINFO_RESPONSE_CODE, &response_status);
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s <= Recv header:%ld eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status, url_print ? url : "",
- url_diff ? url_target : "");
+ if (verbose_logging > 1)
+ write_log_num("<= Recv header:",response_status);
response_module = response_status / (long)100;
@@ -1254,16 +1292,12 @@
case 1: /* 100-Continue and 101 responses */
if (! first_hdr_1xx (cctx))
{
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s:!! %ld CONTINUE: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log_num("!! CONT",response_status);
/* First header of 1xx response */
first_hdr_1xx_inc (cctx);
stat_1xx_inc (cctx); /* Increment number of 1xx responses */
- const unsigned long time_1xx_resp = get_tick_count ();
- stat_appl_delay_add (cctx, time_1xx_resp);
+ stat_appl_delay_add (cctx, time_resp);
}
first_hdrs_clear_non_1xx (cctx);
@@ -1273,19 +1307,15 @@
case 2: /* 200 OK */
if (! first_hdr_2xx (cctx))
{
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s:!! %ld OK: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log_num("!! OK",response_status);
/* First header of 2xx response */
first_hdr_2xx_inc (cctx);
stat_2xx_inc (cctx); /* Increment number of 2xx responses */
/* Count into the averages HTTP/S server response delay */
- const unsigned long time_2xx_resp = get_tick_count ();
- stat_appl_delay_2xx_add (cctx, time_2xx_resp);
- stat_appl_delay_add (cctx, time_2xx_resp);
+ stat_appl_delay_2xx_add (cctx, time_resp);
+ stat_appl_delay_add (cctx, time_resp);
}
first_hdrs_clear_non_2xx (cctx);
break;
@@ -1293,15 +1323,12 @@
case 3: /* 3xx REDIRECTIONS */
if (! first_hdr_3xx (cctx))
{
- fprintf(cctx->file_output, "%ld %s:!! %ld REDIRECTION: %s: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status, data,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log_num("!! RDR",response_status);
/* First header of 3xx response */
first_hdr_3xx_inc (cctx);
stat_3xx_inc (cctx); /* Increment number of 3xx responses */
- const unsigned long time_3xx_resp = get_tick_count ();
- stat_appl_delay_add (cctx, time_3xx_resp);
+ stat_appl_delay_add (cctx, time_resp);
}
first_hdrs_clear_non_3xx (cctx);
break;
@@ -1309,16 +1336,13 @@
case 4: /* 4xx Client Error */
if (! first_hdr_4xx (cctx))
{
- fprintf(cctx->file_output, "%ld %s :!! %ld CLIENT_ERROR : %s: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status, data,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log_ext("!! CLER",response_status,data);
/* First header of 4xx response */
first_hdr_4xx_inc (cctx);
stat_4xx_inc (cctx); /* Increment number of 4xx responses */
- const unsigned long time_4xx_resp = get_tick_count ();
- stat_appl_delay_add (cctx, time_4xx_resp);
+ stat_appl_delay_add (cctx, time_resp);
}
first_hdrs_clear_non_4xx (cctx);
break;
@@ -1327,24 +1351,20 @@
case 5: /* 5xx Server Error */
if (! first_hdr_5xx (cctx))
{
- fprintf(cctx->file_output, "%ld %s :!! %ld SERVER_ERROR : %s: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name, response_status, data,
- url_print ? url : "", url_diff ? url_target : "");
+ write_log_ext("!! SRER",response_status,data);
/* First header of 5xx response */
first_hdr_5xx_inc (cctx);
stat_5xx_inc (cctx); /* Increment number of 5xx responses */
- const unsigned long time_5xx_resp = get_tick_count ();
- stat_appl_delay_add (cctx, time_5xx_resp);
+ stat_appl_delay_add (cctx, time_resp);
}
first_hdrs_clear_non_5xx (cctx);
break;
default :
- fprintf(cctx->file_output,
- "%ld %s:<= WARNING: parsing error: wrong response code (FTP?) %ld .\n",
- cctx->cycle_num, cctx->client_name, response_status /*(char*) data*/);
+ write_log_num("<= WARNING: wrong response code (FTP?)",
+ response_status);
/* FTP breaks it: - cctx->client_state = CSTATE_ERROR; */
break;
}
@@ -1375,9 +1395,11 @@
break;
case CURLINFO_DATA_IN:
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s <= Recv data: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name,
+ if (verbose_logging > 1)
+ (void)fprintf(cctx->file_output,
+ "%ld %ld %ld %s<= Recv data: eff-url: %s, url: %s\n",
+ offs_resp, cctx->cycle_num, cctx->url_curr_index,
+ cctx->client_name,
url_print ? url : "", url_diff ? url_target : "");
stat_data_in_add (cctx, (unsigned long) size);
@@ -1385,10 +1407,8 @@
break;
case CURLINFO_SSL_DATA_IN:
- if (verbose_logging)
- fprintf(cctx->file_output, "%ld %s <= Recv ssl data: eff-url: %s, url: %s\n",
- cctx->cycle_num, cctx->client_name,
- url_print && url ? url : "", url_diff ? url_target : "");
+ if (verbose_logging > 1)
+ write_log("<=","Recv ssl data");
stat_data_in_add (cctx, (unsigned long) size);
first_hdrs_clear_all (cctx);
@@ -1447,10 +1467,15 @@
*/
cctx->cycle_num = 0;
- snprintf(cctx->client_name, sizeof(cctx->client_name) - 1,
+ if (verbose_logging > 1)
+ snprintf(cctx->client_name, sizeof(cctx->client_name) - 1,
"%d (%s) ",
i + 1,
bctx->ip_addr_array[i]);
+ else
+ /* Shorten client name for low logging */
+ snprintf(cctx->client_name, sizeof(cctx->client_name) - 1,
+ "%d ",i+1);
/* Mark timer-ids as non-valid. */
cctx->tid_sleeping = cctx->tid_url_completion = -1;
diff -ur curl-loader/loader_fsm.c curl-loader.564+0.48.vs1/loader_fsm.c
--- curl-loader/loader_fsm.c 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/loader_fsm.c 2009-08-13 12:00:01.000000000 -0700
@@ -319,14 +319,16 @@
Therefore, remembering here possible error state.
*/
int recoverable_error_state = cctx->client_state;
-
+ if (bctx->run_time && (now_time - bctx->start_time >= bctx->run_time))
+ rval_load = CSTATE_FINISHED_OK;
+ else
/*
Initialize virtual client's CURL handle for the next step of loading by calling
load_<state-name>_state() function relevant for a particular client state.
*/
- rval_load = load_state_func_table[cctx->client_state+1] (cctx,
- now_time,
- &interleave_waiting_time);
+ rval_load = load_state_func_table[cctx->client_state+1] (cctx,
+ now_time,
+ &interleave_waiting_time);
/*
Update operational statistics
@@ -668,6 +670,7 @@
cctx->preload_url_curr_index = cctx->url_curr_index;
/* Schedule the client immediately */
+ cctx->req_sent_timestamp = now_time;
if (curl_multi_add_handle (bctx->multiple_handle, cctx->handle) == CURLM_OK)
{
unsigned long timer_url_completion = 0;
@@ -1071,7 +1074,7 @@
{
advance_cycle_num (cctx);
- if (cctx->cycle_num >= bctx->cycles_num)
+ if (bctx->cycles_num && cctx->cycle_num >= bctx->cycles_num)
{
return (cctx->client_state = CSTATE_ERROR);
}
@@ -1127,7 +1130,7 @@
//
advance_cycle_num (cctx);
- if (cctx->cycle_num == bctx->cycles_num)
+ if (bctx->cycles_num && cctx->cycle_num == bctx->cycles_num)
{
// Cycling completed
diff -ur curl-loader/Makefile curl-loader.564+0.48.vs1/Makefile
--- curl-loader/Makefile 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/Makefile 2009-08-13 12:46:29.000000000 -0700
@@ -171,6 +171,6 @@
$(OBJ_DIR)/%.o: %.c
$(CC) $(CFLAGS) $(PROF_FLAG) $(OPT_FLAGS) $(DEBUG_FLAGS) $(INCDIR) -c -o $(OBJ_DIR)/$*.o $<
-$(CONF_OBJ):
+$(CONF_OBJ): parse_conf.c
rm -rf $(OBJ_DIR)/parse_conf.o
$(CC) $(CFLAGS) $(PROF_FLAG) $(DEBUG_FLAGS) $(INCDIR) -c -o $(OBJ_DIR)/parse_conf.o parse_conf.c
diff -ur curl-loader/parse_conf.c curl-loader.564+0.48.vs1/parse_conf.c
--- curl-loader/parse_conf.c 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/parse_conf.c 2009-08-13 13:05:19.000000000 -0700
@@ -102,8 +102,10 @@
static int ip_addr_max_parser (batch_context*const bctx, char*const value);
static int ip_shared_num_parser (batch_context*const bctx, char*const value);
static int cycles_num_parser (batch_context*const bctx, char*const value);
+static int run_time_parser (batch_context*const bctx, char*const value);
static int user_agent_parser (batch_context*const bctx, char*const value);
static int urls_num_parser (batch_context*const bctx, char*const value);
+static int dump_opstats_parser (batch_context*const bctx, char*const value);
/*
* URL section tag parsers.
@@ -172,8 +174,10 @@
{"IP_ADDR_MAX", ip_addr_max_parser},
{"IP_SHARED_NUM", ip_shared_num_parser},
{"CYCLES_NUM", cycles_num_parser},
+ {"RUN_TIME", run_time_parser},
{"USER_AGENT", user_agent_parser},
{"URLS_NUM", urls_num_parser},
+ {"DUMP_OPSTATS", dump_opstats_parser},
/*------------------------ URL SECTION -------------------------------- */
@@ -869,6 +873,43 @@
}
return 0;
}
+
+static int run_time_parser (batch_context*const bctx, char*const value)
+{
+ char *token = 0, *strtokp = 0;
+ const char *delim = ":";
+ long dhms[4];
+ int ct = 0;
+ const int max_ct = sizeof(dhms)/sizeof(*dhms);
+ char value_buf[100];
+ // preserve value from destruction by strtok
+ (void)strncpy(value_buf,value,sizeof(value_buf));
+ (void)memset((char *)dhms,0,sizeof(dhms));
+ for (token = strtok_r(value_buf,delim,&strtokp);
+ token != 0; token = strtok_r(0,delim,&strtokp), ct++)
+ {
+ if (ct >= max_ct)
+ {
+ (void)fprintf(stderr,
+ "%s - error: a value in the form [[[D:]H:]M:]S is expected"
+ " for tag RUN_TIME\n", __func__);
+ return -1;
+ }
+ int i = 0;
+ while (++i < max_ct)
+ dhms[i - 1] = dhms[i];
+ dhms[max_ct - 1] = atol(token);
+ }
+ long run_time = (60 * (60 * (24 * dhms[0] + dhms[1]) + dhms[2]) + dhms[3])*
+ 1000; // msecs
+ if (run_time < 0)
+ {
+ run_time = LONG_MAX - 1;
+ }
+ bctx->run_time = (unsigned long)run_time;
+ return 0;
+}
+
static int clients_rampup_inc_parser (batch_context*const bctx, char*const value)
{
bctx->clients_rampup_inc = atol (value);
@@ -918,6 +959,21 @@
return 0;
}
+static int dump_opstats_parser (batch_context*const bctx, char*const value)
+{
+ if (value[0] == 'Y' || value[0] == 'y' ||
+ value[0] == 'N' || value[0] == 'n')
+ bctx->dump_opstats = (value[0] == 'Y' || value[0] == 'y');
+ else
+ {
+ fprintf (stderr,
+ "%s - error: DUMP_OPSTATS value (%s) must start with Y|y|N|n.\n",
+ __func__, value);
+ return -1;
+ }
+ return 0;
+}
+
static int url_parser (batch_context*const bctx, char*const value)
{
size_t url_length = 0;
@@ -2730,6 +2786,12 @@
set_default_response_errors_table ();
+ /* for compatibility with older configurations set default value
+ of dump_opstats to 1 ("yes") */
+ unsigned i;
+ for (i = 0; i < bctx_array_size; i++)
+ bctx_array[i].dump_opstats = 1;
+
while (fgets (fgets_buff, sizeof (fgets_buff) - 1, fp))
{
// fprintf (stderr, "%s - processing file string \"%s\n",
diff -ur curl-loader/statistics.c curl-loader.564+0.48.vs1/statistics.c
--- curl-loader/statistics.c 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/statistics.c 2009-08-13 12:00:01.000000000 -0700
@@ -27,6 +27,7 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include "batch.h"
#include "client.h"
@@ -57,7 +58,8 @@
stat_point *sd,
unsigned long period);
-static void print_operational_statistics (op_stat_point*const osp_curr,
+static void print_operational_statistics (FILE *opstats_file,
+ op_stat_point*const osp_curr,
op_stat_point*const osp_total,
url_context* url_arr);
@@ -400,7 +402,8 @@
}
op_stat_point_add (&bctx->op_total, &bctx->op_delta);
- print_operational_statistics (&bctx->op_delta,
+ print_operational_statistics (bctx->opstats_file,
+ &bctx->op_delta,
&bctx->op_total,
bctx->url_ctx_array);
@@ -430,13 +433,34 @@
}
dump_clients (cctx);
- fprintf (stderr, "\nExited. For details look in the files:\n"
+ (void)fprintf (stderr, "\nExited. For details look in the files:\n"
"- %s.log for errors and traces;\n"
"- %s.txt for loading statistics;\n"
- "- %s.ctx for virtual client based statistics.\n"
- "You may add -v and -u options to the command line for more "
- "verbouse output to %s.log file.\n", bctx->batch_name, bctx->batch_name,
- bctx->batch_name, bctx->batch_name);
+ "- %s.ctx for virtual client based statistics.\n",
+ bctx->batch_name, bctx->batch_name, bctx->batch_name);
+ if (bctx->dump_opstats)
+ (void)fprintf (stderr,"- %s.ops for operational statistics.\n",
+ bctx->batch_name);
+ (void)fprintf (stderr,
+ "Add -v and -u options to the command line for "
+ "verbose output to %s.log file.\n",bctx->batch_name);
+}
+
+/******
+* Function name - ascii_time
+*
+* Description - evaluate current time in ascii
+*
+* Input - *tbuf - pointer to time buffer
+* Return - tbuf filled with time
+******/
+
+char *ascii_time (char *tbuf)
+{
+ time_t timeb;
+
+ (void)time(&timeb);
+ return ctime_r(&timeb,tbuf);
}
/****************************************************************************************
@@ -593,7 +617,8 @@
op_stat_point_add (&bctx->op_total, &bctx->op_delta );
- print_operational_statistics (&bctx->op_delta,
+ print_operational_statistics (bctx->opstats_file,
+ &bctx->op_delta,
&bctx->op_total,
bctx->url_ctx_array);
@@ -811,29 +836,33 @@
/***********************************************************************************
* Function name - print_operational_statistics
*
-* Description - Prints to stdout number of login, UAS - for each URL and logoff operations
+* Description - writes number of login, UAS - for each URL and logoff operations
* success and failure numbers
*
-* Input - *osp_curr - pointer to the current operational statistics point
+* Input - *opstats_file - FILE pointer
+* *osp_curr - pointer to the current operational statistics point
* *osp_total - pointer to the current operational statistics point
*
* Return Code/Output - None
*************************************************************************************/
-static void print_operational_statistics (op_stat_point*const osp_curr,
+static void print_operational_statistics (FILE *opstats_file,
+ op_stat_point*const osp_curr,
op_stat_point*const osp_total,
url_context* url_arr)
{
- if (!osp_curr || !osp_total)
+ if (!osp_curr || !osp_total || !opstats_file)
return;
- fprintf (stdout, " Operations:\t\t Success\t\t Failed\t\t\tTimed out\n");
+ (void)fprintf (opstats_file,
+ " Operations:\t\t Success\t\t Failed\t\t\tTimed out\n");
if (osp_curr->url_num && (osp_curr->url_num == osp_total->url_num))
{
unsigned long i;
for (i = 0; i < osp_curr->url_num; i++)
{
- fprintf (stdout, "URL%ld:%-12.12s\t%-6ld %-8ld\t\t%-6ld %-8ld\t\t%-6ld %-8ld\n",
+ (void)fprintf (opstats_file,
+ "URL%ld:%-12.12s\t%-6ld %-8ld\t\t%-6ld %-8ld\t\t%-6ld %-8ld\n",
i, url_arr[i].url_short_name,
osp_curr->url_ok[i], osp_total->url_ok[i],
osp_curr->url_failed[i], osp_total->url_failed[i],
diff -ur curl-loader/statistics.h curl-loader.564+0.48.vs1/statistics.h
--- curl-loader/statistics.h 2009-08-09 13:27:26.000000000 -0700
+++ curl-loader.564+0.48.vs1/statistics.h 2009-08-13 12:00:01.000000000 -0700
@@ -216,10 +216,22 @@
****************************************************************************************/
void dump_final_statistics (struct client_context* cctx);
+/******
+* Function name - ascii_time
+*
+* Description - evaluate current time in ascii
+*
+* Input - *tbuf - pointer to time buffer
+* Return - tbuf filled with time
+******/
+
+char *ascii_time (char *tbuf);
+
/****************************************************************************************
-* Function name - dump_snapshot_interval and up to the interval time summary statistics
+* Function name - dump_snapshot_interval
*
* Description - Dumps summary statistics since the start of load
+* and up to the interval
*
* Input - *bctx - pointer to batch structure
* now - current time in msec since the epoch
|
