mturk 2004/07/27 22:38:45
Modified: ajp/ajplib/test testajp.c
Log:
Make test case actually do something.
Revision Changes Path
1.4 +124 -12 jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c
Index: testajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testajp.c 27 Jul 2004 17:28:31 -0000 1.3
+++ testajp.c 28 Jul 2004 05:38:45 -0000 1.4
@@ -39,38 +39,150 @@
#include <arpa/inet.h>
#endif
-int test_create_conn(apr_pool_t *pool)
+/* Main process */
+static process_rec *main_process;
+/* Default server */
+static server_rec *main_server;
+
+#if APR_HAS_THREADS
+
+#define TEST_THREAD_COUNT 10
+static apr_thread_t *threads[TEST_THREAD_COUNT];
+
+static void * APR_THREAD_FUNC thread_worker_func(apr_thread_t *thd, void *data)
{
- conn_rec *c;
+ request_rec *r;
+ conn_rec *c = (conn_rec *)data;
+
+ /* Create an empty request */
+ if (!(r = ap_wrap_create_request(c)))
+ goto cleanup;
+
+ /* TODO: do something usefull */
+ apr_sleep(apr_time_from_sec(1));
+
+ /* Clean up the request */
+ apr_pool_destroy(r->pool);
+
+ apr_thread_exit(thd, APR_SUCCESS);
+ return NULL;
+cleanup:
+ apr_thread_exit(thd, APR_EGENERAL);
+ return NULL;
+}
+
+static int create_threads(server_rec *server)
+{
+ int i;
+ apr_status_t rv;
+
+ for (i = 0; i < TEST_THREAD_COUNT; i++) {
+ conn_rec *c;
+ /* Create a single client connection. The dummy one of course. */
+ if (!(c = ap_run_create_connection(server->process->pool, server,
+ NULL, 0, NULL, NULL)))
+ return -1;
+
+ if ((rv = apr_thread_create(&threads[i], NULL,
+ thread_worker_func, (void *)c,
+ server->process->pool)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_INFO, rv, NULL, "apr_create_thread
failed");
+ return -1;
+ }
+ }
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "Created %d worker threads", i);
- if (!(c = ap_run_create_connection(pool, NULL, NULL,
- 0, NULL, NULL)))
- return -1;
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "local ip %s:%d",
- c->local_ip, c->local_addr->port);
-
return 0;
}
+static int join_threads()
+{
+ int i, rc = 0;
+ apr_status_t rv;
+
+ for (i = 0; i < TEST_THREAD_COUNT; i++) {
+ apr_thread_join(&rv, threads[i]);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "Worker thread %d
failed", i);
+ rc = -1;
+ }
+ }
+
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "All (%d) worker threads joined",
i);
+
+ return rc;
+}
+
+#endif
int main(int argc, const char * const * argv, const char * const *env)
{
int rv = 0;
- apr_pool_t *ctx;
+ conn_rec *c;
+ request_rec *r;
+
apr_app_initialize(&argc, &argv, &env);
- apr_pool_create(&ctx, NULL);
/* This is done in httpd.conf using LogLevel debug directive.
* We are setting this directly.
*/
ap_default_loglevel = APLOG_DEBUG;
ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "Testing ajp...");
- ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "create conn...");
- if ((rv = test_create_conn(ctx)))
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "Creating main server...");
+
+ main_process = ap_wrap_create_process(argc, argv);
+ /* Create the main server_rec */
+ main_server = ap_wrap_create_server(main_process, main_process->pool);
+ /* Create a single client connection. The dummy one of course. */
+ if (!(c = ap_run_create_connection(main_process->pool, main_server,
+ NULL, 0, NULL, NULL))) {
+ rv = -1;
+ goto finished;
+ }
+ /* ... and a empty request */
+ if (!(r = ap_wrap_create_request(c))) {
+ rv = -1;
+ goto finished;
+ }
+
+
+ /* 0. Fill in the request data */
+
+ /*
+ * Up to here HTTPD created that for each request.
+ * From now on, we have a server_rec, conn_rec, and request_rec
+ * Who will ever need something else :)
+ */
+
+ /* 1. Obtain a connection to backend */
+
+ /* 2. Create AJP message */
+
+ /* 3. Send AJP message */
+
+ /* 4. Read AJP response */
+
+ /* 5. Display results */
+
+ /* 6. Release the connection */
+
+
+#if APR_HAS_THREADS_remove_this
+ /* or make the few requests in paralel
+ * to test the threading.
+ * the upper 7 steps will go to thread_worker_func
+ */
+ if ((rv = create_threads(main_server)))
goto finished;
+
+ if ((rv = join_threads()))
+ goto finished;
+#endif
finished:
ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "%s", rv == 0 ? "OK" : "FAILED");
apr_terminate();
+
+ return rv;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
