axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject svn commit: r728975 - in /webservices/axis2/trunk/c: ides/vc/axis2c/axis2_tcp_receiver/ ides/vc/axis2c/axis2_tcp_server/ src/core/transport/tcp/ src/core/transport/tcp/receiver/ src/core/transport/tcp/server/simple_tcp_server/
Date Tue, 23 Dec 2008 14:44:37 GMT
Author: shankar
Date: Tue Dec 23 06:44:37 2008
New Revision: 728975

URL: http://svn.apache.org/viewvc?rev=728975&view=rev
Log:
Fix for issue AXIS2C-1268

Added:
    webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_receiver.c
Removed:
    webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/tcp_receiver.c
Modified:
    webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_receiver/axis2_tcp_receiver.vcproj
    webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_server/axis2_tcp_server.vcproj
    webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h
    webservices/axis2/trunk/c/src/core/transport/tcp/receiver/Makefile.am
    webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/Makefile.am

Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_receiver/axis2_tcp_receiver.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_receiver/axis2_tcp_receiver.vcproj?rev=728975&r1=728974&r2=728975&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_receiver/axis2_tcp_receiver.vcproj
(original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_receiver/axis2_tcp_receiver.vcproj
Tue Dec 23 06:44:37 2008
@@ -176,19 +176,19 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{7C816A64-FA96-4C6C-8DB0-5256441F54BC}"
-			RelativePathToProject=".\axiom\axiom.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axiom\axiom.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
-			RelativePathToProject=".\axis2_engine\axis2_engine.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_engine\axis2_engine.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
-			RelativePathToProject=".\axutil\axutil.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axutil\axutil.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}"
-			RelativePathToProject=".\axis2_parser\axis2_parser.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_parser\axis2_parser.vcproj"
 		/>
 	</References>
 	<Files>
@@ -202,6 +202,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\core\transport\tcp\receiver\tcp_receiver.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\core\transport\tcp\receiver\tcp_svr_thread.c"
 				>
 			</File>

Modified: webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_server/axis2_tcp_server.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_server/axis2_tcp_server.vcproj?rev=728975&r1=728974&r2=728975&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_server/axis2_tcp_server.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/axis2_tcp_server/axis2_tcp_server.vcproj Tue
Dec 23 06:44:37 2008
@@ -175,23 +175,23 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
-			RelativePathToProject=".\axutil\axutil.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axutil\axutil.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
-			RelativePathToProject=".\axis2_engine\axis2_engine.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_engine\axis2_engine.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{7C816A64-FA96-4C6C-8DB0-5256441F54BC}"
-			RelativePathToProject=".\axiom\axiom.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axiom\axiom.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}"
-			RelativePathToProject=".\axis2_parser\axis2_parser.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_parser\axis2_parser.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{8C8F2D61-0C61-4E90-9CA2-E0C795725DF7}"
-			RelativePathToProject=".\axis2_tcp_receiver\axis2_tcp_receiver.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_tcp_receiver\axis2_tcp_receiver.vcproj"
 		/>
 	</References>
 	<Files>
@@ -201,10 +201,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\..\src\core\transport\tcp\server\simple_tcp_server\tcp_receiver.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\core\transport\tcp\server\simple_tcp_server\tcp_server_main.c"
 				>
 			</File>

Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h?rev=728975&r1=728974&r2=728975&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h Tue Dec 23 06:44:37
2008
@@ -41,13 +41,13 @@
 {
 #endif
 
-    axis2_transport_receiver_t *AXIS2_CALL
+    AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL
     axis2_tcp_server_create(
         const axutil_env_t * env,
         const axis2_char_t * repo,
         const int port);
 
-    axis2_status_t AXIS2_CALL
+    AXIS2_EXTERN axis2_status_t AXIS2_CALL
     axis2_tcp_server_stop(
         axis2_transport_receiver_t * server,
         const axutil_env_t * env);

Modified: webservices/axis2/trunk/c/src/core/transport/tcp/receiver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/receiver/Makefile.am?rev=728975&r1=728974&r2=728975&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/receiver/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/receiver/Makefile.am Tue Dec 23 06:44:37
2008
@@ -5,7 +5,8 @@
 
 libaxis2_tcp_receiver_la_SOURCES = tcp_svr_thread.c \
                                     tcp_worker.c \
-                                    simple_tcp_svr_conn.c
+                                    simple_tcp_svr_conn.c \
+									tcp_receiver.c
 
 
 libaxis2_tcp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)

Added: webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_receiver.c?rev=728975&view=auto
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_receiver.c (added)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_receiver.c Tue Dec 23 06:44:37
2008
@@ -0,0 +1,320 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <axis2_tcp_transport.h>
+#include <axis2_tcp_svr_thread.h>
+#include <axis2_tcp_server.h>
+#include <axis2_transport_in_desc.h>
+#include <axutil_param_container.h>
+#include <axutil_url.h>
+#include <axis2_conf_init.h>
+#include <stdlib.h>
+
+/**
+ * @brief TCP Client struct impl
+ *   Axis2 TCP Client impl
+ */
+
+typedef struct axis2_tcp_server_impl
+{
+    axis2_transport_receiver_t tcp_server;
+    axis2_tcp_svr_thread_t *svr_thread;
+    int port;
+    axis2_conf_ctx_t *conf_ctx;
+    axis2_conf_ctx_t *conf_ctx_private;
+    axis2_conf_t *conf;
+}
+axis2_tcp_server_impl_t;
+
+#define AXIS2_INTF_TO_IMPL(tcp_server) \
+                ((axis2_tcp_server_impl_t *)(tcp_server))
+
+/***************************** Function headers *******************************/
+
+axis2_status_t AXIS2_CALL axis2_tcp_server_init(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env,
+    axis2_conf_ctx_t * conf_ctx,
+    axis2_transport_in_desc_t * in_desc);
+
+axis2_status_t AXIS2_CALL axis2_tcp_server_start(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env);
+
+axis2_status_t AXIS2_CALL axis2_tcp_server_stop(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env);
+
+axis2_conf_ctx_t *AXIS2_CALL axis2_tcp_server_get_conf_ctx(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env);
+
+axis2_endpoint_ref_t *AXIS2_CALL axis2_tcp_server_get_reply_to_epr(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env,
+    const axis2_char_t * svc_name);
+
+axis2_bool_t AXIS2_CALL axis2_tcp_server_is_running(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env);
+
+void AXIS2_CALL axis2_tcp_server_free(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env);
+
+static const axis2_transport_receiver_ops_t tcp_transport_receiver_ops_var = {
+    axis2_tcp_server_init,
+    axis2_tcp_server_start,
+    axis2_tcp_server_get_reply_to_epr,
+    axis2_tcp_server_get_conf_ctx,
+    axis2_tcp_server_is_running,
+    axis2_tcp_server_stop,
+    axis2_tcp_server_free
+};
+
+AXIS2_EXTERN axis2_transport_receiver_t *AXIS2_CALL
+axis2_tcp_server_create(
+    const axutil_env_t * env,
+    const axis2_char_t * repo,
+    const int port)
+{
+    axis2_tcp_server_impl_t *server_impl = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+
+    server_impl = (axis2_tcp_server_impl_t *) AXIS2_MALLOC
+        (env->allocator, sizeof(axis2_tcp_server_impl_t));
+
+    if (!server_impl)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    server_impl->svr_thread = NULL;
+    server_impl->conf_ctx = NULL;
+    server_impl->conf_ctx_private = NULL;
+    server_impl->port = port;
+
+    server_impl->tcp_server.ops = &tcp_transport_receiver_ops_var;
+
+    if (repo)
+    {
+
+        /**
+         * We first create a private conf ctx which is owned by this server
+         * we only free this private conf context. We should never free the
+         * server_impl->conf_ctx because it may own to any other object which
+         * may lead to double free
+         */
+        server_impl->conf_ctx_private = axis2_build_conf_ctx(env, repo);
+        if (!server_impl->conf_ctx_private)
+        {
+            axis2_tcp_server_free((axis2_transport_receiver_t *) server_impl,
+                                  env);
+            return NULL;
+        }
+        server_impl->conf_ctx = server_impl->conf_ctx_private;
+    }
+    return &(server_impl->tcp_server);
+}
+
+void AXIS2_CALL
+axis2_tcp_server_free(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env)
+{
+    axis2_tcp_server_impl_t *server_impl = NULL;
+    AXIS2_ENV_CHECK(env, void);
+    server_impl = AXIS2_INTF_TO_IMPL(server);
+    if (server_impl->svr_thread)
+    {
+        axis2_tcp_svr_thread_destroy(server_impl->svr_thread, env);
+        axis2_tcp_svr_thread_free(server_impl->svr_thread, env);
+        server_impl->svr_thread = NULL;
+    }
+
+    if (server_impl->conf_ctx_private)
+    {
+        axis2_conf_ctx_free(server_impl->conf_ctx_private, env);
+        server_impl->conf_ctx_private = NULL;
+    }
+
+    /**
+     * Do not free this. It may own to some other object
+     */
+    server_impl->conf_ctx = NULL;
+    AXIS2_FREE(env->allocator, server_impl);
+    return;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_tcp_server_init(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env,
+    axis2_conf_ctx_t * conf_ctx,
+    axis2_transport_in_desc_t * in_desc)
+{
+    axis2_tcp_server_impl_t *server_impl = NULL;
+    axis2_char_t *port_str = NULL;
+    axutil_param_t *param = NULL;
+
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    server_impl = AXIS2_INTF_TO_IMPL(server);
+
+    server_impl->conf_ctx = conf_ctx;
+    param =
+        (axutil_param_t *)
+        axutil_param_container_get_param(axis2_transport_in_desc_param_container
+                                         (in_desc, env), env, "port");
+    if (param)
+    {
+        port_str = axutil_param_get_value(param, env);
+    }
+    if (port_str)
+    {
+        server_impl->port = atoi(port_str);
+    }
+    return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_tcp_server_start(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env)
+{
+
+    axis2_tcp_server_impl_t *server_impl = NULL;
+    axis2_tcp_worker_t *worker = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    server_impl = AXIS2_INTF_TO_IMPL(server);
+    server_impl->svr_thread = axis2_tcp_svr_thread_create(env,
+                                                          server_impl->port);
+    if (!server_impl->svr_thread)
+    {
+        return AXIS2_FAILURE;
+    }
+    worker = axis2_tcp_worker_create(env, server_impl->conf_ctx);
+    axis2_tcp_worker_set_svr_port(worker, env, server_impl->port);
+    if (!worker)
+    {
+        axis2_tcp_svr_thread_free(server_impl->svr_thread, env);
+        return AXIS2_FAILURE;
+    }
+    AXIS2_LOG_INFO(env->log, "Starting TCP server thread");
+    axis2_tcp_svr_thread_set_worker(server_impl->svr_thread, env, worker);
+    axis2_tcp_svr_thread_run(server_impl->svr_thread, env);
+    return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_tcp_server_stop(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env)
+{
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    AXIS2_LOG_INFO(env->log, "Terminating TCP server thread");
+    if (AXIS2_INTF_TO_IMPL(server)->svr_thread)
+    {
+        axis2_tcp_svr_thread_destroy(AXIS2_INTF_TO_IMPL(server)->svr_thread,
+                                     env);
+    }
+    AXIS2_LOG_INFO(env->log, "Successfully terminated  TCP server" " thread");
+    return AXIS2_SUCCESS;
+}
+
+axis2_conf_ctx_t *AXIS2_CALL
+axis2_tcp_server_get_conf_ctx(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env)
+{
+    AXIS2_ENV_CHECK(env, NULL);
+    return AXIS2_INTF_TO_IMPL(server)->conf_ctx;
+}
+
+axis2_endpoint_ref_t *AXIS2_CALL
+axis2_tcp_server_get_reply_to_epr(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env,
+    const axis2_char_t * svc_name)
+{
+    axis2_endpoint_ref_t *epr = NULL;
+    const axis2_char_t *host_address = NULL;
+    axis2_char_t *svc_path = NULL;
+    axutil_url_t *url = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
+
+    host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
+    svc_path = axutil_stracat(env, "/axis2/services/", svc_name);
+    url = axutil_url_create(env, "tcp", host_address,
+                            AXIS2_INTF_TO_IMPL(server)->port, svc_path);
+    AXIS2_FREE(env->allocator, svc_path);
+    if (!url)
+    {
+        return NULL;
+    }
+    epr = axis2_endpoint_ref_create(env, axutil_url_to_external_form(url, env));
+    axutil_url_free(url, env);
+    return epr;
+}
+
+axis2_bool_t AXIS2_CALL
+axis2_tcp_server_is_running(
+    axis2_transport_receiver_t * server,
+    const axutil_env_t * env)
+{
+    axis2_tcp_server_impl_t *server_impl = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    server_impl = AXIS2_INTF_TO_IMPL(server);
+    if (!server_impl->svr_thread)
+    {
+        return AXIS2_FALSE;
+    }
+    return axis2_tcp_svr_thread_is_running(server_impl->svr_thread, env);
+}
+
+/**
+ * Following block distinguish the exposed part of the dll.
+ */
+AXIS2_EXPORT int
+axis2_get_instance(
+    struct axis2_transport_receiver **inst,
+    const axutil_env_t * env)
+{
+    *inst = axis2_tcp_server_create(env, NULL, -1);
+    if (!(*inst))
+    {
+        return AXIS2_FAILURE;
+    }
+
+    return AXIS2_SUCCESS;
+}
+
+AXIS2_EXPORT int
+axis2_remove_instance(
+    axis2_transport_receiver_t * inst,
+    const axutil_env_t * env)
+{
+    if (inst)
+    {
+        axis2_transport_receiver_free(inst, env);
+    }
+    return AXIS2_SUCCESS;
+}

Modified: webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/Makefile.am?rev=728975&r1=728974&r2=728975&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
(original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
Tue Dec 23 06:44:37 2008
@@ -2,8 +2,7 @@
 prgbin_PROGRAMS = axis2_tcp_server
 SUBDIRS =
 AM_CFLAGS = -g -pthread
-axis2_tcp_server_SOURCES = tcp_server_main.c \
-                            tcp_receiver.c
+axis2_tcp_server_SOURCES = tcp_server_main.c 
 
 axis2_tcp_server_LDADD   =  $(LDFLAGS) \
 		             $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \



Mime
View raw message