You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2010/11/30 02:43:06 UTC
svn commit: r1040383 [22/38] - in /trafficserver/traffic/branches/wccp: ./
build/ contrib/ contrib/perl/AdminClient/lib/Apache/TS/ example/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ exa...
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/ClientAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/ClientAPI.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/ClientAPI.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/ClientAPI.h Tue Nov 30 01:42:55 2010
@@ -30,45 +30,45 @@
typedef enum
{
- INK_FID_OPTIONS_PROCESS,
- INK_FID_OPTIONS_PROCESS_FINISH,
- INK_FID_CONNECTION_FINISH,
- INK_FID_PLUGIN_FINISH,
- INK_FID_REQUEST_CREATE,
- INK_FID_HEADER_PROCESS,
- INK_FID_PARTIAL_BODY_PROCESS,
- INK_FID_REPORT
-} INKPluginFuncId;
+ TS_FID_OPTIONS_PROCESS,
+ TS_FID_OPTIONS_PROCESS_FINISH,
+ TS_FID_CONNECTION_FINISH,
+ TS_FID_PLUGIN_FINISH,
+ TS_FID_REQUEST_CREATE,
+ TS_FID_HEADER_PROCESS,
+ TS_FID_PARTIAL_BODY_PROCESS,
+ TS_FID_REPORT
+} TSPluginFuncId;
typedef enum
{
- INK_CONN_COMPLETE,
- INK_CONN_ERR,
- INK_READ_ERR,
- INK_WRITE_ERR,
- INK_TIME_EXPIRE
-} INKConnectionStatus;
+ TS_CONN_COMPLETE,
+ TS_CONN_ERR,
+ TS_READ_ERR,
+ TS_WRITE_ERR,
+ TS_TIME_EXPIRE
+} TSConnectionStatus;
typedef enum
{
- INK_STOP_SUCCESS,
- INK_STOP_FAIL,
- INK_KEEP_GOING
-} INKRequestAction;
+ TS_STOP_SUCCESS,
+ TS_STOP_FAIL,
+ TS_KEEP_GOING
+} TSRequestAction;
typedef enum
{
- INK_SUM,
- INK_MAX,
- INK_MIN,
- INK_AVE
-} INKReportCombiner;
+ TS_SUM,
+ TS_MAX,
+ TS_MIN,
+ TS_AVE
+} TSReportCombiner;
extern "C"
{
- extern void INKReportSingleData(char *metric, char *unit, INKReportCombiner combiner, double value);
+ extern void TSReportSingleData(char *metric, char *unit, TSReportCombiner combiner, double value);
- extern void INKFuncRegister(INKPluginFuncId fid);
+ extern void TSFuncRegister(TSPluginFuncId fid);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.cc (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.cc Tue Nov 30 01:42:55 2010
@@ -214,7 +214,7 @@ Config::read_target_byterate_dist()
}
printf("\n");
}
-Config::Config(long warmup, char *config_file, INKPlugin * aplug_in, int aread_timeout)
+Config::Config(long warmup, char *config_file, TSPlugin * aplug_in, int aread_timeout)
{
char line[MAX_LINE_SIZE], lhs[MAX_LINE_SIZE], rhs[MAX_LINE_SIZE];
int c;
@@ -286,7 +286,7 @@ Config::Config(long warmup, char *config
#ifdef _PLUG_IN
// target_host, target_port, and document_base
- // will be passed to the INKOptionProcess() later, and
+ // will be passed to the TSOptionProcess() later, and
// comments are skipped.
if ((strcmp(lhs, "target_host") || strcmp(lhs, "target_port") || strcmp(lhs, "document_base")) && strcmp(lhs, "")) {
if (plug_in->options_process_fcn) {
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Config.h Tue Nov 30 01:42:55 2010
@@ -59,7 +59,7 @@ struct Config
char target_byterate_dist_file[MAX_FILENAME_SIZE];
/* File that has target_byterate distribution */
FILE *conf_file, *log_file_p, *docsize_dist_file_p, *thinktime_dist_file_p, *target_byterate_dist_file_p;
- INKPlugin *plug_in;
+ TSPlugin *plug_in;
int direct;
int synthetic;
int execution_interval;
@@ -86,14 +86,14 @@ struct Config
double cumulative_size_prob[MAX_SIZES];
void read_docsize_dist(long warmup);
int num_thinktimes;
- long thinktimes[MAX_THINKTIMES];
- double cumulative_thinktime_prob[MAX_THINKTIMES];
+ long thinktimes[MAX_THTSTIMES];
+ double cumulative_thinktime_prob[MAX_THTSTIMES];
int num_target_byterates;
long target_byterates[MAX_TARGET_BYTERATES];
double cumulative_target_byterate_prob[MAX_TARGET_BYTERATES];
void read_thinktime_dist();
void read_target_byterate_dist();
- Config(long warmup, char *config_file, INKPlugin * aplug_in, int rd_tout);
+ Config(long warmup, char *config_file, TSPlugin * aplug_in, int rd_tout);
};
#endif // #ifndef _Config_h_
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Defines.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Defines.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Defines.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Defines.h Tue Nov 30 01:42:55 2010
@@ -31,7 +31,7 @@
#define MAX_ORIGIN_SERVERS 10 /* Max Origin Servers */
#define MAX_STATUS_LEN 1024 /* Max Status Line Len */
#define MAX_SIZES 1000 /* Max number of synthetic doc sizes */
-#define MAX_THINKTIMES 1000 /* Max number of think times */
+#define MAX_THTSTIMES 1000 /* Max number of think times */
#define MAX_TARGET_BYTERATES 1000 /* Max number of byterates */
#define MAX_SIZESTR_SIZE 20 /* sizestr looks like "size120 */
#define MAX_SERIALNUMBERSTR_SIZE 20
@@ -45,6 +45,6 @@
#define MAX_PORTNAME_SIZE 64
#define MAX_LINE_SIZE 1000
#define MAX_FILENAME_SIZE 80
-#define MAX_WARMUP_USERS 120 // See INKqa04115: Warmup causes x86 linux to hang
+#define MAX_WARMUP_USERS 120 // See TSqa04115: Warmup causes x86 linux to hang
#endif // #define _Defines_h_
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.cc (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.cc Tue Nov 30 01:42:55 2010
@@ -69,7 +69,7 @@ DoTest::initialize_stats()
above_connect_time_cutoff = 0; /* Reqs above connect cutoff */
generated_thinktime = 0; /* Total number of reqs generated */
- for (i = 0; i < MAX_THINKTIMES; i++) {
+ for (i = 0; i < MAX_THTSTIMES; i++) {
thinktime_generated[i] = 0; /* Number of reqs with each thinktime */
}
@@ -139,7 +139,7 @@ DoTest::create_new_connection_and_send_r
perror(err);
#ifdef _PLUG_IN
- user_info[user].conn_status = INK_CONN_ERR;
+ user_info[user].conn_status = TS_CONN_ERR;
#endif
return 0;
@@ -158,7 +158,7 @@ DoTest::create_new_connection_and_send_r
perror("Error: connect");
#ifdef _PLUG_IN
- user_info[user].conn_status = INK_CONN_ERR;
+ user_info[user].conn_status = TS_CONN_ERR;
#endif
return 0;
@@ -258,7 +258,7 @@ DoTest::create_new_connection_and_send_r
perror("Error: write");
#ifdef _PLUG_IN
- user_info[user].conn_status = INK_WRITE_ERR;
+ user_info[user].conn_status = TS_WRITE_ERR;
#endif
return 0;
@@ -372,7 +372,7 @@ DoTest::compute_bytes_to_read(int user,
long should_have_read, to_read;
long user_elapsed_time;
- // INKqa04029 tripped this
+ // TSqa04029 tripped this
assert(user_info[user].target_byterate != -2); // Illegal value
if (user_info[user].target_byterate == -1) {
@@ -489,7 +489,7 @@ DoTest::DoTest(int adebug,
double ahistogram_resolution,
long around_trip_time_cutoff,
long afirst_byte_latency_cutoff,
- long aconnect_time_cutoff, int aQOS_docsize, INKPlugin * aplug_in, int arequest_rate)
+ long aconnect_time_cutoff, int aQOS_docsize, TSPlugin * aplug_in, int arequest_rate)
{
debug = adebug;
@@ -595,8 +595,8 @@ DoTest::actual_test(int rr_flag)
user_info[i].request_id = NULL;
user_info[i].target_addr = &(user_info[i].dynamic_target_addr);
user_info[i].content_count = 0;
- user_info[i].action = INK_KEEP_GOING;
- user_info[i].conn_status = INK_CONN_COMPLETE;
+ user_info[i].action = TS_KEEP_GOING;
+ user_info[i].conn_status = TS_CONN_COMPLETE;
#endif
}
@@ -757,7 +757,7 @@ DoTest::actual_test(int rr_flag)
perror("Error: read");
#ifdef _PLUG_IN
- user_info[i].conn_status = INK_READ_ERR;
+ user_info[i].conn_status = TS_READ_ERR;
#endif
// Equivalent to closing the connection, as far as we r concerned
@@ -787,7 +787,7 @@ DoTest::actual_test(int rr_flag)
#ifdef _PLUG_IN
// for indicating to plugin that no more content is returned
if ((user_info[i].status_line_info.status_code == 200 ||
- user_info[i].status_line_info.status_code == 0) && user_info[i].action == INK_KEEP_GOING) {
+ user_info[i].status_line_info.status_code == 0) && user_info[i].action == TS_KEEP_GOING) {
if (plug_in->partial_body_process_fcn) {
(plug_in->partial_body_process_fcn) (user_info[i].request_id, (void *) "", 0, user_info[i].content_count);
}
@@ -795,7 +795,7 @@ DoTest::actual_test(int rr_flag)
if (plug_in->connection_finish_fcn) {
(plug_in->connection_finish_fcn) (user_info[i].request_id, user_info[i].conn_status);
}
- user_info[i].conn_status = INK_CONN_COMPLETE;
+ user_info[i].conn_status = TS_CONN_COMPLETE;
user_info[i].request_id = NULL;
user_info[i].internal_rid = 0;
#endif
@@ -815,12 +815,12 @@ DoTest::actual_test(int rr_flag)
#endif
#ifdef _PLUG_IN
- if (user_info[i].action == INK_STOP_SUCCESS) {
+ if (user_info[i].action == TS_STOP_SUCCESS) {
finished_requests += keepalive;
update_completion_stats(i);
// doesn't support keepalive yet... => keepalive == 1
// 200 response but not an error: close connection requested from plugins
- } else if (user_info[i].action == INK_STOP_FAIL) {
+ } else if (user_info[i].action == TS_STOP_FAIL) {
failed_requests += keepalive;
} else if (user_info[i].status_line_info.status_code != 200 && user_info[i].status_line_info.status_code != 0) {
failed_requests += keepalive;
@@ -869,7 +869,7 @@ DoTest::actual_test(int rr_flag)
#ifdef _PLUG_IN
user_info[i].target_addr = &(user_info[i].dynamic_target_addr);
user_info[i].content_count = 0;
- user_info[i].action = INK_KEEP_GOING;
+ user_info[i].action = TS_KEEP_GOING;
#endif
if (user_info[i].think_time > 0) {
@@ -987,7 +987,7 @@ DoTest::actual_test(int rr_flag)
}
sli->status_line_complete = DONE_READING_HEADERS;
- if (user_info[i].action == INK_STOP_SUCCESS || user_info[i].action == INK_STOP_FAIL) {
+ if (user_info[i].action == TS_STOP_SUCCESS || user_info[i].action == TS_STOP_FAIL) {
goto CONN_FINISH;
}
break;
@@ -1011,7 +1011,7 @@ DoTest::actual_test(int rr_flag)
partial_length = s;
}
- if (sli->status_line_complete == DONE_READING_HEADERS && user_info[i].action == INK_KEEP_GOING) {
+ if (sli->status_line_complete == DONE_READING_HEADERS && user_info[i].action == TS_KEEP_GOING) {
if ((sli->status_code == 200 || sli->status_code == 0)
&& partial_length > 0) {
user_info[i].content_count += partial_length;
@@ -1021,7 +1021,7 @@ DoTest::actual_test(int rr_flag)
(void *) partial_body,
partial_length, user_info[i].content_count);
}
- if (user_info[i].action == INK_STOP_SUCCESS || user_info[i].action == INK_STOP_FAIL) {
+ if (user_info[i].action == TS_STOP_SUCCESS || user_info[i].action == TS_STOP_FAIL) {
goto CONN_FINISH;
}
}
@@ -1131,7 +1131,7 @@ DoTest::actual_test(int rr_flag)
for (i = 0; i < do_test->users; i++) {
if (do_test->user_info[i].internal_rid) {
if (plug_in->connection_finish_fcn) {
- (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, INK_TIME_EXPIRE);
+ (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, TS_TIME_EXPIRE);
}
}
}
@@ -1285,17 +1285,17 @@ DoTest::print_stats(int all)
extern "C"
{
- void INKReportSingleData(char *metric, char *unit, INKReportCombiner combiner, double value)
+ void TSReportSingleData(char *metric, char *unit, TSReportCombiner combiner, double value)
{
switch (combiner) {
- case INK_SUM:
+ case TS_SUM:
do_test->report(metric, unit, "sum", value);
break;
- case INK_MAX:do_test->report(metric, unit, "max", value);
+ case TS_MAX:do_test->report(metric, unit, "max", value);
break;
- case INK_MIN:do_test->report(metric, unit, "min", value);
+ case TS_MIN:do_test->report(metric, unit, "min", value);
break;
- case INK_AVE:do_test->report(metric, unit, "ave Requests", value);
+ case TS_AVE:do_test->report(metric, unit, "ave Requests", value);
break;
default:fprintf(stderr, "Error: Illegal combiner in report");
};
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/DoTest.h Tue Nov 30 01:42:55 2010
@@ -107,8 +107,8 @@ struct UserInfo
#ifdef _PLUG_IN
struct sockaddr_in dynamic_target_addr;
long content_count;
- INKRequestAction action;
- INKConnectionStatus conn_status;
+ TSRequestAction action;
+ TSConnectionStatus conn_status;
#endif
/////////////////////
@@ -166,7 +166,7 @@ struct DoTest
histogram connect_histogram;
long generated_thinktime; /* Total number of reqs generated */
- long thinktime_generated[MAX_THINKTIMES]; /* Number of reqs with
+ long thinktime_generated[MAX_THTSTIMES]; /* Number of reqs with
each thinktime */
double total_actual_thinktime;
@@ -206,7 +206,7 @@ struct DoTest
int client_id; /* Among all the client processes running what
is my Id */
LoadGenerator *load_generator;
- INKPlugin *plug_in;
+ TSPlugin *plug_in;
long warmup;
// =0: real test, > 0 : warmup; create only warmup number of
// requests
@@ -265,7 +265,7 @@ struct DoTest
double ahistogram_resolution,
long around_trip_time_cutoff,
long afirst_byte_latency_cutoff,
- long aconnect_time_cutoff, int aQOS_docsize, INKPlugin * aplug_in, int arequest_rate);
+ long aconnect_time_cutoff, int aQOS_docsize, TSPlugin * aplug_in, int arequest_rate);
void report(char *metric, char *units, char *combiner, double value);
~DoTest()
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/LoadGenerator.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/LoadGenerator.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/LoadGenerator.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/LoadGenerator.h Tue Nov 30 01:42:55 2010
@@ -75,7 +75,7 @@ struct LoadGenerator
int num_sizes; /* Number of sizes in the docsize distribution */
long *sizes; /* actual sizes */
int direct;
- INKPlugin *plug_in;
+ TSPlugin *plug_in;
double *cumulative_size_prob;
/* Cumulative probability of selecting different sizes
cumulative_size_prob[num_sizes-1] must be 1.0 */
@@ -104,7 +104,7 @@ struct LoadGenerator
LoadGenerator(FILE * aurl_file, /* only valid for if synthetic = 0 */
int akeepalive, /* how many requests per connection */
- INKPlugin * aplug_in)
+ TSPlugin * aplug_in)
{
warmup = 0;
synthetic = 0;
@@ -129,7 +129,7 @@ struct LoadGenerator
double *acumulative_size_prob,
/* Cumulative probability of selecting different sizes
cumulative_size_prob[num_sizes-1] must be 1.0 */
- int adirect, INKPlugin * aplug_in)
+ int adirect, TSPlugin * aplug_in)
{
plug_in = aplug_in;
synthetic = 1;
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Main.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Main.cc (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Main.cc Tue Nov 30 01:42:55 2010
@@ -40,7 +40,7 @@
Config *config;
LoadGenerator *load_generator;
DoTest *do_test;
-INKPlugin *plug_in;
+TSPlugin *plug_in;
#if defined(__linux__) || defined(__FreeBSD__)
static void
@@ -65,7 +65,7 @@ signal_handler(int sig, siginfo_t * sinf
if (plug_in->connection_finish_fcn) {
for (int i = 0; i < do_test->users; i++) {
if (do_test->user_info[i].internal_rid) {
- (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, INK_TIME_EXPIRE);
+ (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, TS_TIME_EXPIRE);
}
}
@@ -85,7 +85,7 @@ signal_handler(int sig, siginfo_t * sinf
if (plug_in->connection_finish_fcn) {
for (int i = 0; i < do_test->users; i++) {
if (do_test->user_info[i].internal_rid) {
- (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, INK_TIME_EXPIRE);
+ (plug_in->connection_finish_fcn) (do_test->user_info[i].request_id, TS_TIME_EXPIRE);
}
}
}
@@ -186,7 +186,7 @@ main(int argc, char *argv[])
}
}
- plug_in = new INKPlugin(client_id, api);
+ plug_in = new TSPlugin(client_id, api);
#ifdef _PLUG_IN
plug_in->load_plugin();
#endif
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.cc (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.cc Tue Nov 30 01:42:55 2010
@@ -58,7 +58,7 @@ dlerror(void)
}
#endif
-INKPlugin::INKPlugin(int cid, char *api)
+TSPlugin::TSPlugin(int cid, char *api)
{
client_id = cid;
handle = NULL;
@@ -77,7 +77,7 @@ INKPlugin::INKPlugin(int cid, char *api)
void
-INKPlugin::load_plugin()
+TSPlugin::load_plugin()
{
if (strcmp(path, "")) {
char *plugin_path = (char *) malloc(strlen(path) + 3);
@@ -92,10 +92,10 @@ INKPlugin::load_plugin()
perror("client plugin");
exit(1);
}
- plugin_init_fcn = (PluginInit) dlsym(handle, "INKPluginInit");
+ plugin_init_fcn = (PluginInit) dlsym(handle, "TSPluginInit");
if (!plugin_init_fcn) {
- fprintf(stderr, "unable to find INKPluginInit function: %s", dlerror());
+ fprintf(stderr, "unable to find TSPluginInit function: %s", dlerror());
dlclose(handle);
exit(1);
}
@@ -107,50 +107,50 @@ INKPlugin::load_plugin()
extern "C"
{
- void INKFuncRegister(INKPluginFuncId fid)
+ void TSFuncRegister(TSPluginFuncId fid)
{
plug_in->register_funct(fid);
}
}
void
-INKPlugin::register_funct(INKPluginFuncId fid)
+TSPlugin::register_funct(TSPluginFuncId fid)
{
switch (fid) {
- case INK_FID_OPTIONS_PROCESS:
- options_process_fcn = (OptionsProcess) dlsym(handle, "INKOptionsProcess");
+ case TS_FID_OPTIONS_PROCESS:
+ options_process_fcn = (OptionsProcess) dlsym(handle, "TSOptionsProcess");
break;
- case INK_FID_OPTIONS_PROCESS_FINISH:
- options_process_finish_fcn = (OptionsProcessFinish) dlsym(handle, "INKOptionsProcessFinish");
+ case TS_FID_OPTIONS_PROCESS_FINISH:
+ options_process_finish_fcn = (OptionsProcessFinish) dlsym(handle, "TSOptionsProcessFinish");
break;
- case INK_FID_CONNECTION_FINISH:
- connection_finish_fcn = (ConnectionFinish) dlsym(handle, "INKConnectionFinish");
+ case TS_FID_CONNECTION_FINISH:
+ connection_finish_fcn = (ConnectionFinish) dlsym(handle, "TSConnectionFinish");
break;
- case INK_FID_PLUGIN_FINISH:
- plugin_finish_fcn = (PluginFinish) dlsym(handle, "INKPluginFinish");
+ case TS_FID_PLUGIN_FINISH:
+ plugin_finish_fcn = (PluginFinish) dlsym(handle, "TSPluginFinish");
break;
- case INK_FID_REQUEST_CREATE:
- request_create_fcn = (RequestCreate) dlsym(handle, "INKRequestCreate");
+ case TS_FID_REQUEST_CREATE:
+ request_create_fcn = (RequestCreate) dlsym(handle, "TSRequestCreate");
break;
- case INK_FID_HEADER_PROCESS:
- header_process_fcn = (HeaderProcess) dlsym(handle, "INKHeaderProcess");
+ case TS_FID_HEADER_PROCESS:
+ header_process_fcn = (HeaderProcess) dlsym(handle, "TSHeaderProcess");
break;
- case INK_FID_PARTIAL_BODY_PROCESS:
- partial_body_process_fcn = (PartialBodyProcess) dlsym(handle, "INKPartialBodyProcess");
+ case TS_FID_PARTIAL_BODY_PROCESS:
+ partial_body_process_fcn = (PartialBodyProcess) dlsym(handle, "TSPartialBodyProcess");
break;
- case INK_FID_REPORT:
- report_fcn = (Report) dlsym(handle, "INKReport");
+ case TS_FID_REPORT:
+ report_fcn = (Report) dlsym(handle, "TSReport");
break;
default:
- fprintf(stderr, "Can't register function: unknown type of INKPluginFuncId");
+ fprintf(stderr, "Can't register function: unknown type of TSPluginFuncId");
break;
}
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/Plugin.h Tue Nov 30 01:42:55 2010
@@ -39,14 +39,14 @@
typedef void (*PluginInit) (int);
typedef void (*OptionsProcess) (char *, char *);
typedef void (*OptionsProcessFinish) ();
-typedef void (*ConnectionFinish) (void *, INKConnectionStatus);
+typedef void (*ConnectionFinish) (void *, TSConnectionStatus);
typedef void (*PluginFinish) ();
typedef int (*RequestCreate) (char *, int, char *, int, char *, int, void **);
-typedef INKRequestAction(*HeaderProcess) (void *, char *, int, char *);
-typedef INKRequestAction(*PartialBodyProcess) (void *, void *, int, int);
+typedef TSRequestAction(*HeaderProcess) (void *, char *, int, char *);
+typedef TSRequestAction(*PartialBodyProcess) (void *, void *, int, int);
typedef void (*Report) ();
-class INKPlugin
+class TSPlugin
{
public:
int client_id;
@@ -63,11 +63,11 @@ public:
PartialBodyProcess partial_body_process_fcn;
Report report_fcn;
- INKPlugin(int cid, char *api);
+ TSPlugin(int cid, char *api);
void load_plugin();
- void register_funct(INKPluginFuncId fid);
+ void register_funct(TSPluginFuncId fid);
};
-extern INKPlugin *plug_in;
+extern TSPlugin *plug_in;
#endif // _Plugin_h_
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/BlackList.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/BlackList.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/BlackList.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/BlackList.c Tue Nov 30 01:42:55 2010
@@ -92,7 +92,7 @@ typedef struct
BlackListPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.allowed_requests = 0;
@@ -105,19 +105,19 @@ INKPluginInit(int client_id)
my_plugin.total_bytes_received = 0;
/* setup the callbacks */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -140,7 +140,7 @@ INKOptionsProcess(char *option, char *va
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
if ((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) {
my_plugin.direct = 1;
@@ -150,9 +150,9 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE) {
+ if (conn_status == TS_TIME_EXPIRE) {
my_plugin.unfinished_documents++;
}
free(req_id);
@@ -160,7 +160,7 @@ INKConnectionFinish(void *req_id, INKCon
void
-INKPluginFinish()
+TSPluginFinish()
{
/* do all cleanup here */
free(my_plugin.target_host);
@@ -171,7 +171,7 @@ INKPluginFinish()
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -205,12 +205,12 @@ INKRequestCreate(char *origin_server_hos
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
if (strstr(header, "200 OK")) {
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* we consider the request to the blacklisted
@@ -218,42 +218,42 @@ INKHeaderProcess(void *req_id, char *hea
else if (strstr(header, "403 Forbidden")) {
my_plugin.forbidden_documents++;
my_plugin.total_bytes_received += length;
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
} else if (strstr(header, "302 Moved Temprarily")) {
my_plugin.redirect_documents++;
my_plugin.total_bytes_received += length;
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
} else {
my_plugin.other_failed_documents++;
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
}
}
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
my_plugin.successful_documents++;
my_plugin.total_bytes_received += (accum_length + ((User *) req_id)->header_bytes);
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Allowed Requests", "count", INK_SUM, (double) my_plugin.allowed_requests);
- INKReportSingleData("Forbidden Requests", "count", INK_SUM, (double) my_plugin.forbidden_requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_documents);
- INKReportSingleData("Forbidden Documents", "count", INK_SUM, (double) my_plugin.forbidden_documents);
- INKReportSingleData("Redirect Documents", "count", INK_SUM, (double) my_plugin.redirect_documents);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_documents);
- INKReportSingleData("Other Fail Documents", "count", INK_SUM, (double) my_plugin.other_failed_documents);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Allowed Requests", "count", TS_SUM, (double) my_plugin.allowed_requests);
+ TSReportSingleData("Forbidden Requests", "count", TS_SUM, (double) my_plugin.forbidden_requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_documents);
+ TSReportSingleData("Forbidden Documents", "count", TS_SUM, (double) my_plugin.forbidden_documents);
+ TSReportSingleData("Redirect Documents", "count", TS_SUM, (double) my_plugin.redirect_documents);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_documents);
+ TSReportSingleData("Other Fail Documents", "count", TS_SUM, (double) my_plugin.other_failed_documents);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend-1.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend-1.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend-1.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend-1.c Tue Nov 30 01:42:55 2010
@@ -94,7 +94,7 @@ typedef struct
CheckAppendPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
@@ -103,21 +103,21 @@ INKPluginInit(int client_id)
fprintf(stderr, "*** CheckAppend-1 Test for append-transform-plugin v1.0***\n");
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(((CONN_DATA *) req_id)->tail_of_resp);
free(req_id);
@@ -125,7 +125,7 @@ INKConnectionFinish(void *req_id, INKCon
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "url_file") == 0) { /* get the live URL file here */
if (!(my_plugin.url_file = fopen(value, "r"))) {
@@ -148,7 +148,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
int n;
@@ -205,7 +205,7 @@ INKOptionsProcessFinish()
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
@@ -220,7 +220,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -266,15 +266,15 @@ INKRequestCreate(char *origin_server_hos
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
-INKRequestAction
-INKPartialBodyProcess(void *request_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *request_id, void *partial_content, int partial_length, int accum_length)
{
char *src;
int room, bytes_to_move;
@@ -283,7 +283,7 @@ INKPartialBodyProcess(void *request_id,
req_id = (CONN_DATA *) request_id;
if (req_id == NULL)
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
/*print_debug((stderr, "req_id %x accum_length %d", req_id, accum_length));
print_debug((stderr, "Rx response %d bytes\n", partial_length)); */
@@ -292,12 +292,12 @@ INKPartialBodyProcess(void *request_id,
if (memcmp(req_id->tail_of_resp, my_plugin.append_content, my_plugin.append_len) == 0) {
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
}
fprintf(stdout, "TEST_FAILED: appended content doesn't match for req_id %x\n", req_id);
print_debug((stderr, "append: [%s] tail_of_resp [%s]\n", my_plugin.append_content, req_id->tail_of_resp));
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
}
/* Response not complete. Copy last _useful_ bytes to tail_of_file buffer */
@@ -327,17 +327,17 @@ INKPartialBodyProcess(void *request_id,
req_id->tail_of_resp_index += partial_length;
req_id->tail_of_resp[req_id->tail_of_resp_index + 1] = '\0';
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckAppend.c Tue Nov 30 01:42:55 2010
@@ -97,7 +97,7 @@ typedef struct
CheckAppendPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
@@ -107,21 +107,21 @@ INKPluginInit(int client_id)
fprintf(stderr, "*** CheckAppend Test for append-transform-plugin v1.0***\n");
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(((CONN_DATA *) req_id)->tail_of_resp);
free(req_id);
@@ -129,7 +129,7 @@ INKConnectionFinish(void *req_id, INKCon
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "url_file") == 0) { /* get the live URL file here */
if (!(my_plugin.url_file = fopen(value, "r"))) {
@@ -154,7 +154,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
int n;
@@ -211,7 +211,7 @@ INKOptionsProcessFinish()
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
@@ -228,7 +228,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -280,8 +280,8 @@ INKRequestCreate(char *origin_server_hos
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
char *content_type;
CONN_DATA *p_conn = (CONN_DATA *) req_id;
@@ -311,12 +311,12 @@ INKHeaderProcess(void *req_id, char *hea
p_conn->check_this_response = 0;
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
-INKRequestAction
-INKPartialBodyProcess(void *request_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *request_id, void *partial_content, int partial_length, int accum_length)
{
char *src;
int room, bytes_to_move;
@@ -325,7 +325,7 @@ INKPartialBodyProcess(void *request_id,
req_id = (CONN_DATA *) request_id;
if (req_id == NULL || (req_id->check_this_response == 0))
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
/*print_debug((stderr, "req_id %x accum_length %d", req_id, accum_length));
print_debug((stderr, "Rx response %d bytes\n", partial_length)); */
@@ -334,12 +334,12 @@ INKPartialBodyProcess(void *request_id,
if (memcmp(req_id->tail_of_resp, my_plugin.append_content, my_plugin.append_len) == 0) {
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
}
fprintf(stdout, "TEST_FAILED: appended content doesn't match for req_id %x\n", req_id);
print_debug((stderr, "append: [%s] tail_of_resp [%s]\n", my_plugin.append_content, req_id->tail_of_resp));
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
}
/* Response not complete. Copy last _useful_ bytes to tail_of_file buffer */
@@ -369,17 +369,17 @@ INKPartialBodyProcess(void *request_id,
req_id->tail_of_resp_index += partial_length;
req_id->tail_of_resp[req_id->tail_of_resp_index + 1] = '\0';
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckContentClient.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckContentClient.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckContentClient.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckContentClient.c Tue Nov 30 01:42:55 2010
@@ -35,24 +35,24 @@
#include <stdlib.h>
void
-INKPluginInit(int clientid)
+TSPluginInit(int clientid)
{
fprintf(stderr, "*** CheckContentClient Test for Client ***\n");
fprintf(stderr, "*** needs to work with CheckContentServer *** \n");
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
int i, code;
@@ -68,5 +68,5 @@ INKPartialBodyProcess(void *req_id, void
}
i--;
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckReplaceHeader.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckReplaceHeader.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckReplaceHeader.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/CheckReplaceHeader.c Tue Nov 30 01:42:55 2010
@@ -48,18 +48,18 @@
int replace_hdr_test_failed;
void
-INKPluginInit(int clientid)
+TSPluginInit(int clientid)
{
replace_hdr_test_failed = 0;
fprintf(stderr, "*** CheckReplaceHeader Test for replace-header-plugin ***\n");
- INKFuncRegister(INK_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
char *accept_ranges_loc;
@@ -72,7 +72,7 @@ INKHeaderProcess(void *req_id, char *hea
/*fprintf(stdout, "Response header is:\n%s\n", header); */
}
replace_hdr_test_failed = (replace_hdr_test_failed + 1) % 200;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
while (*accept_ranges_loc != ':')
@@ -90,10 +90,10 @@ INKHeaderProcess(void *req_id, char *hea
/*fprintf(stdout, "Response header is:\n%s\n", header); */
}
replace_hdr_test_failed = (replace_hdr_test_failed + 1) % 200;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/*fprintf(stdout, "Test PASSED!!!\n"); */
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/ClientAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/ClientAPI.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/ClientAPI.h (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/ClientAPI.h Tue Nov 30 01:42:55 2010
@@ -30,49 +30,49 @@
typedef enum
{
- INK_FID_OPTIONS_PROCESS,
- INK_FID_OPTIONS_PROCESS_FINISH,
- INK_FID_CONNECTION_FINISH,
- INK_FID_PLUGIN_FINISH,
- INK_FID_REQUEST_CREATE,
- INK_FID_HEADER_PROCESS,
- INK_FID_PARTIAL_BODY_PROCESS,
- INK_FID_REPORT
-} INKPluginFuncId;
+ TS_FID_OPTIONS_PROCESS,
+ TS_FID_OPTIONS_PROCESS_FINISH,
+ TS_FID_CONNECTION_FINISH,
+ TS_FID_PLUGIN_FINISH,
+ TS_FID_REQUEST_CREATE,
+ TS_FID_HEADER_PROCESS,
+ TS_FID_PARTIAL_BODY_PROCESS,
+ TS_FID_REPORT
+} TSPluginFuncId;
typedef enum
{
- INK_CONN_COMPLETE,
- INK_CONN_ERR,
- INK_READ_ERR,
- INK_WRITE_ERR,
- INK_TIME_EXPIRE
-} INKConnectionStatus;
+ TS_CONN_COMPLETE,
+ TS_CONN_ERR,
+ TS_READ_ERR,
+ TS_WRITE_ERR,
+ TS_TIME_EXPIRE
+} TSConnectionStatus;
typedef enum
{
- INK_STOP_SUCCESS,
- INK_STOP_FAIL,
- INK_KEEP_GOING
-} INKRequestAction;
+ TS_STOP_SUCCESS,
+ TS_STOP_FAIL,
+ TS_KEEP_GOING
+} TSRequestAction;
typedef enum
{
- INK_SUM,
- INK_MAX,
- INK_MIN,
- INK_AVE
-} INKReportCombiner;
+ TS_SUM,
+ TS_MAX,
+ TS_MIN,
+ TS_AVE
+} TSReportCombiner;
#ifdef __cplusplus
extern "C"
{
#endif
- extern void INKPluginInit(int clientID);
+ extern void TSPluginInit(int clientID);
- extern void INKReportSingleData(char *metric, char *unit, INKReportCombiner combiner, double value);
+ extern void TSReportSingleData(char *metric, char *unit, TSReportCombiner combiner, double value);
- extern void INKFuncRegister(INKPluginFuncId fid);
+ extern void TSFuncRegister(TSPluginFuncId fid);
#ifdef __cplusplus
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/RequestList.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/RequestList.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/RequestList.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/RequestList.c Tue Nov 30 01:42:55 2010
@@ -97,7 +97,7 @@ typedef struct
RequestListPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_documents = 0;
@@ -106,19 +106,19 @@ INKPluginInit(int client_id)
my_plugin.total_bytes_received = 0;
/* setup the callbacks */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
int i;
int rsum;
@@ -170,7 +170,7 @@ INKOptionsProcess(char *option, char *va
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
if ((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) {
my_plugin.direct = 1;
@@ -180,9 +180,9 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE) {
+ if (conn_status == TS_TIME_EXPIRE) {
my_plugin.unfinished_documents++;
}
free(req_id);
@@ -190,7 +190,7 @@ INKConnectionFinish(void *req_id, INKCon
void
-INKPluginFinish()
+TSPluginFinish()
{
/* do all cleanup here */
int i;
@@ -204,7 +204,7 @@ INKPluginFinish()
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -268,49 +268,49 @@ INKRequestCreate(char *origin_server_hos
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
if (strstr(header, "200 OK")) {
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
} else {
my_plugin.other_failed_documents++;
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
}
}
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
my_plugin.successful_documents++;
my_plugin.total_bytes_received += (accum_length + ((User *) req_id)->header_bytes);
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
void
-INKReport()
+TSReport()
{
int i;
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_documents);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_documents);
- INKReportSingleData("Other Failed Documents", "count", INK_SUM, (double) my_plugin.other_failed_documents);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_documents);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_documents);
+ TSReportSingleData("Other Failed Documents", "count", TS_SUM, (double) my_plugin.other_failed_documents);
for (i = 0; i < my_plugin.nlist; i++) {
char s[MAX_FILE_NAME_SIZE + 30];
sprintf(s, "Total Requests from file %d", i);
- INKReportSingleData(s, "count", INK_SUM, (double) my_plugin.list_requests[i]);
+ TSReportSingleData(s, "count", TS_SUM, (double) my_plugin.list_requests[i]);
}
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-0.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-0.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-0.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-0.c Tue Nov 30 01:42:55 2010
@@ -86,26 +86,26 @@ typedef struct
SimSDKtestPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -135,7 +135,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -143,15 +143,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
free(my_plugin.target_host);
@@ -170,7 +170,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -207,18 +207,18 @@ INKRequestCreate(char *origin_server_hos
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* process part of the response returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
if (accum_length >= ((User *) req_id)->doc_size_requested) {
@@ -228,18 +228,18 @@ INKPartialBodyProcess(void *req_id, void
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
/******************** ADDED FUNCTIONS ****************************/
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-1.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-1.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-1.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimBasicAuth-1.c Tue Nov 30 01:42:55 2010
@@ -92,27 +92,27 @@ typedef struct
SimSDKtestPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -146,7 +146,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -154,15 +154,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
@@ -184,7 +184,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -197,7 +197,7 @@ INKRequestCreate(char *origin_server_hos
/*char *url_line = (char *)malloc(MAX_URL_LEN + 1); */
char url_line[MAX_URL_LEN];
- /*printf ("DEBUG: INKRequestCreate: -------- START\n"); */
+ /*printf ("DEBUG: TSRequestCreate: -------- START\n"); */
getUrl(my_plugin.url_file, url_line);
/* SDKtest in "Direct" mode */
@@ -222,25 +222,25 @@ INKRequestCreate(char *origin_server_hos
*req_id = (void *) user;
my_plugin.requests++;
- /*printf ("DEBUG: INKRequestCreate: -------- END\n"); */
+ /*printf ("DEBUG: TSRequestCreate: -------- END\n"); */
return TRUE;
}
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* process part of the response returned either from synthetic
* server or from proxy server
*/
/*
-INKRequestAction INKPartialBodyProcess(void *req_id,
+TSRequestAction TSPartialBodyProcess(void *req_id,
void *partial_content,
int partial_length,
int accum_length)
@@ -254,25 +254,25 @@ INKRequestAction INKPartialBodyProcess(v
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
*/
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
/******************** ADDED FUNCTIONS ****************************/
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBench.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBench.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBench.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBench.c Tue Nov 30 01:42:55 2010
@@ -81,23 +81,23 @@ typedef struct
SimInkbenchPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -123,7 +123,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -131,15 +131,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
free(my_plugin.target_host);
@@ -152,7 +152,7 @@ INKPluginFinish()
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -184,16 +184,16 @@ INKRequestCreate(char *origin_server_hos
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
if (accum_length >= ((User *) req_id)->doc_size_requested) {
@@ -203,19 +203,19 @@ INKPartialBodyProcess(void *req_id, void
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
#define safediv(top,bottom) ((bottom) ? (((double)(top))/((double)(bottom))) : (bottom))
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
- INKReportSingleData("Average Bytes Per Request", "bytes/req", INK_AVE,
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Average Bytes Per Request", "bytes/req", TS_AVE,
(double) safediv(my_plugin.total_bytes_received, my_plugin.successful_requests));
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBenchCache.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBenchCache.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBenchCache.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimInkBenchCache.c Tue Nov 30 01:42:55 2010
@@ -90,23 +90,23 @@ typedef struct
InkBenchCachePlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -134,7 +134,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -142,15 +142,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
free(my_plugin.target_host);
@@ -163,7 +163,7 @@ INKPluginFinish()
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -211,16 +211,16 @@ INKRequestCreate(char *origin_server_hos
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
if (accum_length >= ((User *) req_id)->doc_size_requested) {
@@ -230,19 +230,19 @@ INKPartialBodyProcess(void *req_id, void
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
#define safediv(top,bottom) ((bottom) ? (((double)(top))/((double)(bottom))) : (bottom))
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
- INKReportSingleData("Average Bytes Per Request", "bytes/req", INK_AVE,
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Average Bytes Per Request", "bytes/req", TS_AVE,
(double) safediv(my_plugin.total_bytes_received, my_plugin.successful_requests));
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtest.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtest.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtest.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtest.c Tue Nov 30 01:42:55 2010
@@ -83,26 +83,26 @@ typedef struct
SimSDKtestPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -128,7 +128,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -136,15 +136,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
free(my_plugin.target_host);
@@ -163,7 +163,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -197,18 +197,18 @@ INKRequestCreate(char *origin_server_hos
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* process part of the response returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
if (accum_length >= ((User *) req_id)->doc_size_requested) {
@@ -218,18 +218,18 @@ INKPartialBodyProcess(void *req_id, void
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
/******************** ADDED FUNCTIONS ****************************/
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtestCache.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtestCache.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtestCache.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SimSDKtestCache.c Tue Nov 30 01:42:55 2010
@@ -93,26 +93,26 @@ typedef struct
SDKtestCachePlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.successful_requests = 0;
/* register the plugin functions that are called back
* later in the program */
- INKFuncRegister(INK_FID_OPTIONS_PROCESS);
- INKFuncRegister(INK_FID_OPTIONS_PROCESS_FINISH);
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
- INKFuncRegister(INK_FID_PLUGIN_FINISH);
- INKFuncRegister(INK_FID_REQUEST_CREATE);
- INKFuncRegister(INK_FID_HEADER_PROCESS);
- INKFuncRegister(INK_FID_PARTIAL_BODY_PROCESS);
- INKFuncRegister(INK_FID_REPORT);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS);
+ TSFuncRegister(TS_FID_OPTIONS_PROCESS_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_PLUGIN_FINISH);
+ TSFuncRegister(TS_FID_REQUEST_CREATE);
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
+ TSFuncRegister(TS_FID_PARTIAL_BODY_PROCESS);
+ TSFuncRegister(TS_FID_REPORT);
}
/* process options specified in SDKtest_client.config */
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -140,7 +140,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
read_docsize_dist();
((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) ?
@@ -148,15 +148,15 @@ INKOptionsProcessFinish()
}
void
-INKConnectionFinish(void *req_id, INKConnectionStatus conn_status)
+TSConnectionFinish(void *req_id, TSConnectionStatus conn_status)
{
- if (conn_status == INK_TIME_EXPIRE)
+ if (conn_status == TS_TIME_EXPIRE)
my_plugin.unfinished_requests++;
free(req_id);
}
void
-INKPluginFinish()
+TSPluginFinish()
{
int i;
free(my_plugin.target_host);
@@ -175,7 +175,7 @@ INKPluginFinish()
* i.e. GET URL HTTP/1.0 ....
*/
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -225,18 +225,18 @@ INKRequestCreate(char *origin_server_hos
/* process response header returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
((User *) req_id)->header_bytes = length;
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* process part of the response returned either from synthetic
* server or from proxy server
*/
-INKRequestAction
-INKPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
+TSRequestAction
+TSPartialBodyProcess(void *req_id, void *partial_content, int partial_length, int accum_length)
{
if (partial_length == 0) {
if (accum_length >= ((User *) req_id)->doc_size_requested) {
@@ -246,18 +246,18 @@ INKPartialBodyProcess(void *req_id, void
fprintf(stderr, "ERROR: received bytes < requested bytes");
}
}
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* output report data after the SDKtest report */
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData("Successful Documents", "count", INK_SUM, (double) my_plugin.successful_requests);
- INKReportSingleData("Unfinished Documents", "count", INK_SUM, (double) my_plugin.unfinished_requests);
- INKReportSingleData("Total Bytes Received", "count", INK_SUM, (double) my_plugin.total_bytes_received);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData("Successful Documents", "count", TS_SUM, (double) my_plugin.successful_requests);
+ TSReportSingleData("Unfinished Documents", "count", TS_SUM, (double) my_plugin.unfinished_requests);
+ TSReportSingleData("Total Bytes Received", "count", TS_SUM, (double) my_plugin.total_bytes_received);
}
/******************** ADDED FUNCTIONS ****************************/
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SingleHostFilter.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SingleHostFilter.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SingleHostFilter.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/SingleHostFilter.c Tue Nov 30 01:42:55 2010
@@ -71,7 +71,7 @@ URL_TYPE select_url_catagory();
FilterPlugin my_plugin;
void
-INKPluginInit(int client_id)
+TSPluginInit(int client_id)
{
my_plugin.requests = 0;
my_plugin.allowed_requests = 0;
@@ -79,7 +79,7 @@ INKPluginInit(int client_id)
}
void
-INKOptionsProcess(char *option, char *value)
+TSOptionsProcess(char *option, char *value)
{
if (strcmp(option, "target_host") == 0) {
my_plugin.target_host = strdup(value);
@@ -93,7 +93,7 @@ INKOptionsProcess(char *option, char *va
}
void
-INKOptionsProcessFinish()
+TSOptionsProcessFinish()
{
if ((strlen(my_plugin.target_host) == 0) || (strlen(my_plugin.target_port) == 0)) {
my_plugin.direct = 1;
@@ -104,7 +104,7 @@ INKOptionsProcessFinish()
void
-INKPluginFinish()
+TSPluginFinish()
{
/* do clean up here */
free(my_plugin.target_host);
@@ -114,7 +114,7 @@ INKPluginFinish()
int
-INKRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
+TSRequestCreate(char *origin_server_host /* return */ , int max_hostname_size,
char *origin_server_port /* return */ , int max_portname_size,
char *request_buf /* return */ , int max_request_size,
void **req_id /* return */ )
@@ -151,32 +151,32 @@ INKRequestCreate(char *origin_server_hos
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
if (strstr(header, "200 OK")) {
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
/* since SDKtest_client core will treat non 200 response as fail request,
* we need to specify it as a successful request explicitly
*/
else if (strstr(header, "403 Forbidden")) {
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
} else if (strstr(header, "302 Moved Temporarily")) {
- return INK_STOP_SUCCESS;
+ return TS_STOP_SUCCESS;
} else {
- return INK_STOP_FAIL;
+ return TS_STOP_FAIL;
}
}
#define safediv(top,bottom) ((bottom) ? (((double)(top))/((double)(bottom))) : (bottom))
void
-INKReport()
+TSReport()
{
- INKReportSingleData("Total Requests", "count", INK_SUM, (double) my_plugin.requests);
- INKReportSingleData((char *) "Allowed Requests", (char *) "count", INK_SUM, (double) my_plugin.allowed_requests);
- INKReportSingleData((char *) "Forbidden Requests", (char *) "count", INK_SUM, (double) my_plugin.forbidden_requests);
+ TSReportSingleData("Total Requests", "count", TS_SUM, (double) my_plugin.requests);
+ TSReportSingleData((char *) "Allowed Requests", (char *) "count", TS_SUM, (double) my_plugin.allowed_requests);
+ TSReportSingleData((char *) "Forbidden Requests", (char *) "count", TS_SUM, (double) my_plugin.forbidden_requests);
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/connection_finish.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/connection_finish.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/connection_finish.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/connection_finish.c Tue Nov 30 01:42:55 2010
@@ -25,29 +25,29 @@
#include <stdio.h>
void
-INKPluginInit(int clientid)
+TSPluginInit(int clientid)
{
fprintf(stderr, "connection finish!!!\n");
- INKFuncRegister(INK_FID_CONNECTION_FINISH);
+ TSFuncRegister(TS_FID_CONNECTION_FINISH);
}
void
-INKConnectionFinish(void *rid, INKConnectionStatus status)
+TSConnectionFinish(void *rid, TSConnectionStatus status)
{
switch (status) {
- case INK_CONN_COMPLETE:
+ case TS_CONN_COMPLETE:
fprintf(stderr, "c");
break;
- case INK_TIME_EXPIRE:
+ case TS_TIME_EXPIRE:
fprintf(stderr, "x");
break;
- case INK_CONN_ERR:
+ case TS_CONN_ERR:
fprintf(stderr, "e");
break;
- case INK_READ_ERR:
+ case TS_READ_ERR:
fprintf(stderr, "r");
break;
- case INK_WRITE_ERR:
+ case TS_WRITE_ERR:
fprintf(stderr, "w");
break;
default:
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/header_process.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/header_process.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/header_process.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/header_process.c Tue Nov 30 01:42:55 2010
@@ -29,15 +29,15 @@
#include <stdio.h>
void
-INKPluginInit(int clientid)
+TSPluginInit(int clientid)
{
- fprintf(stderr, "*** INKHeaderProcess Test for Client ***\n");
- INKFuncRegister(INK_FID_HEADER_PROCESS);
+ fprintf(stderr, "*** TSHeaderProcess Test for Client ***\n");
+ TSFuncRegister(TS_FID_HEADER_PROCESS);
}
-INKRequestAction
-INKHeaderProcess(void *req_id, char *header, int length, char *request_str)
+TSRequestAction
+TSHeaderProcess(void *req_id, char *header, int length, char *request_str)
{
- return INK_KEEP_GOING;
+ return TS_KEEP_GOING;
}
Modified: trafficserver/traffic/branches/wccp/test/SDKtest/client/api/hello_world.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/test/SDKtest/client/api/hello_world.c?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/test/SDKtest/client/api/hello_world.c (original)
+++ trafficserver/traffic/branches/wccp/test/SDKtest/client/api/hello_world.c Tue Nov 30 01:42:55 2010
@@ -32,10 +32,10 @@
#include "ClientAPI.h"
#include <stdio.h>
-/* INKPluginInit() must be provided */
+/* TSPluginInit() must be provided */
void
-INKPluginInit(int clientid)
+TSPluginInit(int clientid)
{
fprintf(stderr, "hello world!!!\n");
}