Author: veithm
Date: Mon Oct 22 12:32:26 2012
New Revision: 1400862
URL: http://svn.apache.org/viewvc?rev=1400862&view=rev
Log:
ETCH-243 Fixed small template related bug in code generation
Change-Id: Ic7963da6bc3fdff6b1925a4e5e00534953cd7e84
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1400862&r1=1400861&r2=1400862&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
Mon Oct 22 12:32:26 2012
@@ -51,7 +51,7 @@ class Run${mthd.vname($helper)}
{
public:
Run${mthd.vname($helper)}(EtchRuntime* runtime)
- : EtchStubHelper(runtime) {
+ : EtchStubHelper<$i$suffix>(runtime) {
}
~Run${mthd.vname($helper)}() {
Author: veithm
Date: Mon Oct 22 12:25:06 2012
New Revision: 1400861
URL: http://svn.apache.org/viewvc?rev=1400861&view=rev
Log:
ETCH-245 Refactoring of ant/CMake build system of cpp-binding
Introduction of toolchain files
Change-Id: Ieaa654df10a20ce6cc69a3438b37c690b9e140a9
Added:
incubator/etch/trunk/binding-cpp/runtime/build.properties
incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86_32.toolchain
- copied, changed from r1399123, incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/
incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_ARMv7l.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_32.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_64.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/QNX_X86_32.toolchain
- copied, changed from r1399123, incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain
incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain
Removed:
incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain
Modified:
incubator/etch/trunk/binding-cpp/runtime/CMakeLists.txt
incubator/etch/trunk/binding-cpp/runtime/build.xml
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/StringUtils.inc
incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
incubator/etch/trunk/build-support/dependencies.xml
incubator/etch/trunk/build-support/etch.common.xml
incubator/etch/trunk/build.dependencies
incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java (contents,
props changed)
Modified: incubator/etch/trunk/binding-cpp/runtime/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/CMakeLists.txt?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/CMakeLists.txt Mon Oct 22 12:25:06 2012
@@ -33,6 +33,11 @@ IF (NOT ETCH_EXTERNAL_DEPENDS)
MESSAGE (FATAL_ERROR "ETCH_EXTERNAL_DEPENDS not set")
ENDIF (NOT ETCH_EXTERNAL_DEPENDS)
+# Check Toolchain file
+IF (NOT CMAKE_TOOLCHAIN_FILE)
+ MESSAGE (FATAL_ERROR "CMAKE_TOOLCHAIN_FILE not set")
+ENDIF (NOT CMAKE_TOOLCHAIN_FILE)
+
#VLD
SET(VLD ${ETCH_EXTERNAL_DEPENDS}/vld/1.9h)
@@ -47,15 +52,7 @@ SET(CAPU_PROJECT_DIR "${CMAKE_CURRENT_SO
SET(CAPU_CMAKE_BUILD_DIR "${CAPU_PROJECT_DIR}/build")
SET(CAPU_CMAKE_TOOLCHAIN_DIR "${CAPU_PROJECT_DIR}/cmake/acme/toolchain")
SET(CAPU_DELIVERABLE_DIR "${CAPU_PROJECT_DIR}/deliverable")
-IF(UNIX)
- SET(CAPU_CMAKE_TOOLCHAIN_FILE "Linux_X86_32.toolchain")
- add_definitions("-DOS_LINUX")
- add_definitions("-DARCH_X86_32")
-ELSEIF(WIN32)
- SET(CAPU_CMAKE_TOOLCHAIN_FILE "Windows_X86_32.toolchain")
- add_definitions("-DOS_WINDOWS")
- add_definitions("-DARCH_X86_32")
-ENDIF()
+
include(ExternalProject)
ExternalProject_Add(
@@ -64,7 +61,7 @@ ExternalProject_Add(
BINARY_DIR "${CAPU_CMAKE_BUILD_DIR}"
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
- CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:PATH=${CAPU_CMAKE_TOOLCHAIN_DIR}/${CAPU_CMAKE_TOOLCHAIN_FILE}
+ CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
)
@@ -73,9 +70,9 @@ SET(CAPU "${CAPU_PROJECT_DIR}/deliverabl
# Set definitions
-IF (UNIX)
+IF (TARGET_OS STREQUAL "Linux")
add_definitions (-D_GNU_SOURCE -D_REENTRANT -DLINUX=2 -D__LINUX__)
-ENDIF (UNIX)
+ENDIF ()
add_definitions (-D_UNICODE -DUNICODE)
# etch libary
Added: incubator/etch/trunk/binding-cpp/runtime/build.properties
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/build.properties?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/build.properties (added)
+++ incubator/etch/trunk/binding-cpp/runtime/build.properties Mon Oct 22 12:25:06 2012
@@ -0,0 +1,15 @@
+#Set the platforms which should be build by running ant
+
+
+#target.platforms=Windows_X86_32, QNX_X86_32
+#target.platforms.Windows_X86_32.generator=Visual Studio 8 2005
+#target.platforms.QNX_X86_32.generator=Unix Makefiles
+
+#preventing execution of tests
+#target.platforms.QNX_X86_32.crosscompile=1
+
+
+#target.platforms=Linux_X86_32, Linux_ARMv7l
+#target.platforms.Linux_X86_32.generator=Unix Makefiles
+#target.platforms.Linux_ARMv7l.generator=Unix Makefiles
+#target.platforms.Linux_ARMv7l.crosscompile=1
Modified: incubator/etch/trunk/binding-cpp/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/build.xml?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-cpp/runtime/build.xml Mon Oct 22 12:25:06 2012
@@ -20,6 +20,13 @@
<project name="etch-cpp-runtime" basedir="." default="help">
<description>Etch-to-CPP runtime binding implementation</description>
<property name="Etch.basedir" location="${basedir}/../.." />
+
+ <property file="build.properties"/>
+
+ <!-- import custom rules which can be used by depending projects to override ant targets
-->
+ <import file="custom_rules.xml" optional="true" />
+
+ <!-- import etch generics -->
<import file="${Etch.basedir}/build-support/etch.includes.xml" />
<!-- Static properties of the sub-project -->
@@ -30,19 +37,73 @@
<!-- INIT TARGET -->
<!-- Modify this target to define project specific properties that can only be set
at runtime -->
<target name="do-init" >
- <mkdir dir="${target}" />
- <mkdir dir="${testResultsDirectory}" />
+ <property name="target_platform" location="${target}/${platform}"/>
+ <property name="testResultsDirectory_platform" location="${testResultsDirectory}/${platform}"/>
+ <echo>${target_platform} created</echo>
+ <mkdir dir="${target_platform}" />
+ <mkdir dir="${testResultsDirectory_platform}" />
</target>
<!-- CLEAN TARGET -->
<target name="do-clean">
<delete dir="${target}" />
- <delete dir="${proj}/lib/capu/3psw/libs" />
- <delete dir="${proj}/lib/capu/build" />
- <delete dir="${proj}/lib/capu/deliverable" />
+ <delete dir="${proj}/lib/capu/3psw/libs" />
+ <delete dir="${proj}/lib/capu/build" />
+ <delete dir="${proj}/lib/capu/deliverable" />
+ </target>
+
+ <target name="do-clean-capu">
+ <delete dir="${proj}/lib/capu/build" />
+ <delete dir="${proj}/lib/capu/deliverable" />
</target>
<!-- BUILD TARGET -->
+
+ <!-- overriding build target from etch.include.xml -->
+ <target name="build" depends="">
+ <!-- Build platform targets -->
+ <if>
+ <not><isset property="${target.platforms}"/></not>
+ <then>
+ <echo level="warn">No target.platforms set. Trying to build for detected
host platform...</echo>
+ <if>
+ <os family="windows" />
+ <then>
+ <property name="target.platforms" value="Windows_X86_32"/>
+ </then>
+ </if>
+ <if>
+ <os family="unix" />
+ <then>
+ <property name="target.platforms" value="Linux_X86_32"/>
+ </then>
+ </if>
+ </then>
+ </if>
+
+ <if>
+ <equals arg1="${target.platforms}" arg2=""/>
+ <then>
+ <echo>${target.platforms}</echo>
+ <fail message="Not able to detect platform. target.platforms is not set.
Aborting."/>
+ </then>
+ </if>
+ <for list="${target.platforms}" param="platform" delimiter="," trim="true">
+ <sequential>
+ <var name="platform" value="@{platform}"/>
+ <echo>Init platform: ${platform}</echo>
+ <antcall target="init"/>
+ <echo>Building platform: ${platform}</echo>
+ <antcall target="do-build"/>
+ <echo>Testing platform: ${platform}</echo>
+ <antcall target="do-test"/>
+ <!-- TODO remove this as soon as ACME in capu is able to build multiple
targets -->
+ <antcall target="do-clean-capu"/>
+ </sequential>
+ </for>
+
+ </target>
+
<target name="do-build-info" unless="USE.cmake">
<echo message="**********************************" />
<echo message="binding-cpp build will not be done." />
@@ -61,17 +122,32 @@
</zip>
</target>
- <!-- Uncomment the generator you would like to use on your platform. If no generator
is set explicitly the default generator will be used. -->
<target name="do-build-main" if="USE.cmake">
- <echo>"${basedir}/target"</echo>
- <cmake srcdir="${basedir}" bindir="${basedir}/target" buildtype="Debug" >
- <!--<generator name="Visual Studio 8 2005" platform="windows" />-->
- <!--<generator name="Visual Studio 9 2008" platform="windows" />-->
- <!--<generator name="Visual Studio 10 2010" platform="windows" />-->
- <!--<generator name="Unix Makefiles"/>-->
- <!--<generator name="Eclipse CDT4 - Unix Makefiles" platform="Linux" />-->
- <variable name="ETCH_EXTERNAL_DEPENDS" type="PATH" value="${env.ETCH_EXTERNAL_DEPENDS}"
/>
- </cmake>
+ <if>
+ <isset property="target.platforms.${platform}.generator"/>
+ <then>
+ <!-- use specified generator -->
+ <propertycopy name="cmake.generator" from="target.platforms.${platform}.generator"
/>
+ <echo>Configuring CMake build</echo>
+ <echo>Using generator: ${cmake.generator}</echo>
+ <echo>Using toolchain file: ${basedir}/toolchains/${platform}.toolchain</echo>
+ <cmake srcdir="${basedir}" bindir="${target}/${platform}/${Etch.build.target}"
buildtype="${Etch.build.target}" >
+ <generator name="${cmake.generator}" />
+ <variable name="ETCH_EXTERNAL_DEPENDS" type="PATH" value="${env.ETCH_EXTERNAL_DEPENDS}"
/>
+ <variable name="CMAKE_TOOLCHAIN_FILE" type="FILEPATH" value="${basedir}/toolchains/${platform}.toolchain"
/>
+ </cmake>
+ </then>
+ <else>
+ <!-- try default generator -->
+ <echo>Configuring CMake build</echo>
+ <echo>Using default generator</echo>
+ <echo>Using toolchain file: ${basedir}/toolchains/${platform}.toolchain</echo>
+ <cmake srcdir="${basedir}" bindir="${target}/${platform}/${Etch.build.target}"
buildtype="${Etch.build.target}" >
+ <variable name="ETCH_EXTERNAL_DEPENDS" type="PATH" value="${env.ETCH_EXTERNAL_DEPENDS}"
/>
+ <variable name="CMAKE_TOOLCHAIN_FILE" type="FILEPATH" value="${basedir}/toolchains/${platform}.toolchain"
/>
+ </cmake>
+ </else>
+ </if>
</target>
<target name="do-build" depends="do-build-info,do-build-generate-sources,do-build-main"
if="USE.cmake">
@@ -87,11 +163,43 @@
</fileset>
</copy>
+ <property name="capu.library.output.path.prefix" value="${proj}/lib/capu/deliverable/capu/lib/${platform}"/>
+ <property name="capu.binary.output.path.prefix" value="${proj}/lib/capu/deliverable/capu/bin/${platform}"/>
+ <property name="etch.library.output.path.prefix" value="${target}/${platform}/${Etch.build.target}/src/main"/>
+ <property name="etch.binary.output.path.prefix" value="${target}/${platform}/${Etch.build.target}/src/test"/>
+
+ <if>
+ <!-- Visual Studio adds the Debug/Release folder, other generators do not
-->
+ <equals arg1="${platform}" arg2="Windows_X86_32" />
+ <then>
+ <property name="capu.library.output.path" value="${capu.library.output.path.prefix}/${Etch.build.target}"
/>
+ <property name="capu.binary.output.path" value="${capu.binary.output.path.prefix}/${Etch.build.target}"
/>
+ <property name="etch.library.output.path" value="${etch.library.output.path.prefix}/${Etch.build.target}"
/>
+ <property name="etch.binary.output.path" value="${etch.binary.output.path.prefix}/${Etch.build.target}"
/>
+ </then>
+ <else>
+ <property name="capu.library.output.path" value="${capu.library.output.path.prefix}"
/>
+ <property name="capu.binary.output.path" value="${capu.binary.output.path.prefix}"
/>
+ <property name="etch.library.output.path" value="${etch.library.output.path.prefix}"
/>
+ <property name="etch.binary.output.path" value="${etch.binary.output.path.prefix}"
/>
+ </else>
+ </if>
+
<!-- copy etch library to dist folder -->
- <copy todir="${Etch.dist}/binding-cpp/lib" flatten="true">
- <fileset dir="${target}/src/main">
- </fileset>
- </copy>
+ <copy todir="${Etch.dist}/binding-cpp/lib/${platform}/${Etch.build.target}" flatten="true">
+ <fileset dir="${etch.library.output.path}">
+ <include name="*.lib" />
+ <include name="*.a" />
+ </fileset>
+ </copy>
+
+ <!-- copy etch tests to dist folder -->
+ <copy todir="${Etch.dist}/binding-cpp/bin/${platform}/${Etch.build.target}" flatten="true">
+ <fileset dir="${etch.binary.output.path}">
+ <include name="etch-cpp-test.exe" />
+ <include name="etch-cpp-test" />
+ </fileset>
+ </copy>
<!-- copy capu includes to dist folder -->
<copy todir="${Etch.dist}/binding-cpp/include">
@@ -101,43 +209,61 @@
</copy>
<!-- copy capu lib to dist folder -->
- <copy todir="${Etch.dist}/binding-cpp/lib">
- <fileset dir="${proj}/lib/capu/deliverable/capu/lib">
- <include name="**/*.lib" />
- <include name="**/*.a" />
+ <copy todir="${Etch.dist}/binding-cpp/lib/${platform}/${Etch.build.target}">
+ <fileset dir="${capu.library.output.path}">
+ <include name="*.lib" />
+ <include name="*.a" />
</fileset>
</copy>
-
+
+ <!-- copy capu tests to dist folder -->
+ <copy todir="${Etch.dist}/binding-cpp/bin/${platform}/${Etch.build.target}">
+ <fileset dir="${capu.binary.output.path}">
+ <include name="capuTest.exe" />
+ <include name="capuTest" />
+ </fileset>
+ </copy>
</target>
<!-- TEST TARGET -->
- <target name="do-test" unless="build.skip.tests">
-
- <!-- Run CAPU Unit Tests -->
- <!-- Run CAPU Unit Tests on Windows-->
- <property name="executable-full-path"
- location="lib/capu/deliverable/capu/bin/Windows_X86_32/Debug/capuTest.exe"/>
- <exec executable="${executable-full-path}" osfamily="windows" failonerror="true">
- <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
- </exec>
- <!-- Run CAPU Unit Tests on Unix -->
- <exec executable="lib/capu/deliverable/capu/bin/Linux_X86_32/capuTest" osfamily="unix"
failonerror="true">
- <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
- </exec>
-
- <!-- Run Etch Unit Tests -->
- <!-- Run Etch Unit Tests on Windows-->
- <exec executable="${target}/src/test/debug/etch-cpp-test" osfamily="windows"
failonerror="true">
- <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
- </exec>
- <!-- Run Etch Unit Tests on Unix -->
- <exec executable="${target}/src/test/etch-cpp-test" osfamily="unix" failonerror="true">
- <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
- </exec>
+ <target name="test" depends="postbuild">
+
</target>
- <!-- POSTBUILD TARGET -->
- <target name="do-postbuild">
+ <target name="postbuild" depends="build,do-postbuild">
+
+ </target>
+
+ <target name="do-test" unless="build.skip.tests">
+ <if>
+ <isset property="target.platforms.${platform}.crosscompile"/>
+ <then>
+ <echo>Not executing tests for cross compiled platform</echo>
+ </then>
+ <else>
+ <!-- Run CAPU Unit Tests -->
+ <!-- Run CAPU Unit Tests on Windows-->
+ <property name="executable-full-path"
+ location="lib/capu/deliverable/capu/bin/Windows_X86_32/${Etch.build.target}/capuTest.exe"/>
+ <exec executable="${executable-full-path}" osfamily="windows" failonerror="true">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+ <!-- Run CAPU Unit Tests on Unix -->
+ <exec executable="lib/capu/deliverable/capu/bin/Linux_X86_32/capuTest"
osfamily="unix" failonerror="true">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+
+ <!-- Run Etch Unit Tests -->
+ <!-- Run Etch Unit Tests on Windows-->
+ <exec executable="${target}/${platform}/${Etch.build.target}/src/test/${Etch.build.target}/etch-cpp-test"
osfamily="windows" failonerror="true">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+ <!-- Run Etch Unit Tests on Unix -->
+ <exec executable="${target}/${platform}/${Etch.build.target}/src/test/etch-cpp-test"
osfamily="unix" failonerror="true">
+ <arg value="--gtest_output=xml:${testResultsDirectory}/"/>
+ </exec>
+ </else>
+ </if>
</target>
<target name="do-publish" if="build.tests.fail">
Copied: incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86_32.toolchain
(from r1399123, incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86_32.toolchain?p2=incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86_32.toolchain&p1=incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain&r1=1399123&r2=1400861&rev=1400861&view=diff
==============================================================================
(empty)
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/StringUtils.inc
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/StringUtils.inc?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/StringUtils.inc
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/StringUtils.inc
Mon Oct 22 12:25:06 2012
@@ -23,5 +23,5 @@
#elif defined(OS_INTEGRITY)
#include "Linux/StringUtils.inc"
#elif defined(OS_QNX)
- #include "Qnx/StringUtils.inc"
+ #include "Linux/StringUtils.inc"
#endif
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt Mon Oct 22 12:25:06 2012
@@ -239,17 +239,10 @@ add_library (etch-cpp STATIC
${MAIN_INCLUDES}
)
-IF (UNIX)
- #TODO: add correct lib here debug / release
- target_link_libraries (etch-cpp ${CAPU}/lib/Linux_X86_32/libcapu.a)
-ELSEIF(WIN32)
- #TODO: add correct lib here debug / release
- target_link_libraries (etch-cpp ${CAPU}/lib/windows_x86_32/debug/capu.lib)
-ENDIF()
-IF (UNIX)
+IF (TARGET_OS STREQUAL "Linux")
set_target_properties (etch-cpp PROPERTIES COMPILE_FLAGS "-m32 -g" LINK_FLAGS "-m32")
-ENDIF (UNIX)
+ENDIF ()
set_target_properties (etch-cpp PROPERTIES OUTPUT_NAME "etch")
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt Mon Oct 22 12:25:06 2012
@@ -24,10 +24,19 @@ include_directories (${GMOCK}/include)
include_directories (${CAPU}/include/capu)
-IF (WIN32 AND BUILD_CHECK_MEMORY)
+IF (TARGET_OS STREQUAL "Windows" AND BUILD_CHECK_MEMORY)
include_directories (${VLD}/include)
add_definitions (-DBUILD_CHECK_MEMORY)
-ENDIF (WIN32 AND BUILD_CHECK_MEMORY)
+ENDIF ()
+
+IF (TARGET_OS STREQUAL "Linux")
+ link_directories(${CAPU}/lib/Linux_X86_32)
+ELSEIF(TARGET_OS STREQUAL "Windows")
+ link_directories(${CAPU}/lib/Windows_X86_32)
+ELSEIF(TARGET_OS STREQUAL "QNX")
+ link_directories(${CAPU}/lib/QNX_X86_32)
+ENDIF()
+
add_executable (etch-cpp-test
common/EtchNumberTest.cpp
@@ -100,22 +109,24 @@ add_executable (etch-cpp-test
main.cpp
)
-IF (UNIX)
- target_link_libraries (etch-cpp-test etch-cpp pthread rt)
-ELSEIF(WIN32)
- target_link_libraries (etch-cpp-test etch-cpp)
+IF (TARGET_OS STREQUAL "Linux")
+ target_link_libraries (etch-cpp-test etch-cpp capu pthread rt)
+ELSEIF(TARGET_OS STREQUAL "Windows")
+ target_link_libraries (etch-cpp-test etch-cpp capu)
+ELSEIF(TARGET_OS STREQUAL "QNX")
+ target_link_libraries (etch-cpp-test etch-cpp capu c socket)
ENDIF()
-IF (WIN32 AND BUILD_CHECK_MEMORY)
+IF (TARGET_OS STREQUAL "Windows" AND BUILD_CHECK_MEMORY)
file (COPY ${VLD}/vld.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
file (COPY ${VLD}/bin/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
file (COPY ${VLD}/bin/vld.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
target_link_libraries (etch-cpp-test ${VLD}/lib/vld.lib)
-ENDIF (WIN32 AND BUILD_CHECK_MEMORY)
+ENDIF ()
-IF (UNIX)
+IF (TARGET_OS STREQUAL "Linux")
set_target_properties (etch-cpp-test PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
-ENDIF (UNIX)
+ENDIF ()
-add_dependencies (etch-cpp Capu)
+add_dependencies (etch-cpp-test etch-cpp Capu)
Added: incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_ARMv7l.toolchain
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_ARMv7l.toolchain?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_ARMv7l.toolchain (added)
+++ incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_ARMv7l.toolchain Mon Oct 22
12:25:06 2012
@@ -0,0 +1,41 @@
+#
+# 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.
+#
+
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(TARGET_OS Linux)
+SET(TARGET_ARCH ARMV7L)
+SET(TARGET_COMPILER GCC)
+
+SET(CMAKE_C_COMPILER /opt/pb-a8/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc)
+SET(CMAKE_CXX_COMPILER /opt/pb-a8/cross/armv7a/bin/arm-angstrom-linux-gnueabi-g++)
+SET(CMAKE_LINKER /opt/pb-a8/cross/armv7a/bin/arm-angstrom-linux-gnueabi-ld)
+
+SET(CMAKE_C_FLAGS_DEBUG "-ggdb -march=armv7-a -mfpu=neon -mfloat-abi=softfp -D_DEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET(CMAKE_C_FLAGS_RELEASE "-O3 -march=armv7-a -mfpu=neon -mfloat-abi=softfp -DNDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+SET(CMAKE_FIND_ROOT_PATH /opt/pb-a8/staging/armv7a-angstrom-linux-gnueabi)
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+add_definitions("-DOS_LINUX")
+add_definitions("-DARCH_ARMV7L")
Added: incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_32.toolchain
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_32.toolchain?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_32.toolchain (added)
+++ incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_32.toolchain Mon Oct 22
12:25:06 2012
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(TARGET_OS Linux)
+SET(TARGET_ARCH X86_32)
+SET(TARGET_COMPILER GCC)
+
+SET(CMAKE_C_FLAGS_DEBUG "-m32 -ggdb -Wall -D_DEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET(CMAKE_C_FLAGS_RELEASE "-m32 -Wall -O3 -DNDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+add_definitions("-DOS_LINUX")
+add_definitions("-DARCH_X86_32")
Added: incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_64.toolchain
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_64.toolchain?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_64.toolchain (added)
+++ incubator/etch/trunk/binding-cpp/runtime/toolchains/Linux_X86_64.toolchain Mon Oct 22
12:25:06 2012
@@ -0,0 +1,32 @@
+#
+# 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.
+#
+
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(TARGET_OS Linux)
+SET(TARGET_ARCH X86_64)
+SET(TARGET_COMPILER GCC)
+
+SET(CMAKE_C_FLAGS_DEBUG "-m64 -ggdb -Wall -D_DEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
+SET(CMAKE_C_FLAGS_RELEASE "-m64 -Wall -O3 -DNDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+add_definitions("-DOS_LINUX")
+add_definitions("-DARCH_X86_64")
Copied: incubator/etch/trunk/binding-cpp/runtime/toolchains/QNX_X86_32.toolchain (from r1399123,
incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/QNX_X86_32.toolchain?p2=incubator/etch/trunk/binding-cpp/runtime/toolchains/QNX_X86_32.toolchain&p1=incubator/etch/trunk/binding-cpp/runtime/lib/capu/cmake/acme/toolchain/QNX_X86.toolchain&r1=1399123&r2=1400861&rev=1400861&view=diff
==============================================================================
(empty)
Added: incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain (added)
+++ incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain Mon Oct 22
12:25:06 2012
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(TARGET_OS Windows)
+SET(TARGET_ARCH X86_32)
+SET(TARGET_COMPILER MSVC)
+
+SET(CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG /MP8 /GR-")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3")
+
+SET(CMAKE_C_FLAGS_DEBUG "/MDd /Zi /Od /RTC1 /D_DEBUG /MP8" )
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3")
+
+
+add_definitions("-DOS_WINDOWS")
+add_definitions("-DARCH_X86_32")
+
+# enable the BUILD_CHECK_MEMORY flag if you would like to check for memory leaks with visual
leak detector
+#add_definitions("-DBUILD_CHECK_MEMORY")
Added: incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain?rev=1400861&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain (added)
+++ incubator/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain Mon Oct 22
12:25:06 2012
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_SYSTEM_VERSION 1)
+
+SET(TARGET_OS Windows)
+SET(TARGET_ARCH X86_64)
+SET(TARGET_COMPILER MSVC)
+
+SET(CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG /MP8 /GR-")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3")
+
+SET(CMAKE_C_FLAGS_DEBUG "/MDd /Zi /Od /RTC1 /D_DEBUG /MP8" )
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3")
+
+
+add_definitions("-DOS_WINDOWS")
+add_definitions("-DARCH_X86_64")
+
+# enable the BUILD_CHECK_MEMORY flag if you would like to check for memory leaks with visual
leak detector
+#add_definitions("-DBUILD_CHECK_MEMORY")
Modified: incubator/etch/trunk/build-support/dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/dependencies.xml?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/dependencies.xml (original)
+++ incubator/etch/trunk/build-support/dependencies.xml Mon Oct 22 12:25:06 2012
@@ -126,12 +126,33 @@
</target>
<target name="check-cmake-check">
- <echo message="check: ${build.ant-cmake.lib}" />
+ <echo message="check: ${build.ant-cmake.lib}" />
<condition property="cmake-missing-components" value="true">
<not><available file="${build.ant-cmake.lib}/cmakeant.jar" /></not>
</condition>
</target>
+
+ <target name="check-ant-contrib" depends="check-ant-contrib-check" if="ant-contrib-missing-components">
+ <echo>
+ *
+ *
+ *
+ ************************************************************************
+ WARNING: ant-contrib.lib is missing, some ant scripts will not work
+ ************************************************************************
+ *
+ *
+ *
+ </echo>
+ </target>
+
+ <target name="check-ant-contrib-check">
+ <echo message="check: ${build.ant-contrib.lib}" />
+ <condition property="ant-contrib-missing-components" value="true">
+ <not><available file="${build.ant-contrib.lib}/ant-contrib-1.0b3.jar"
/></not>
+ </condition>
+ </target>
- <target name="check-all" depends="check-javacc,check-junit,check-velocity,check-dotnet,check-cmake"
/>
+ <target name="check-all" depends="check-javacc,check-junit,check-velocity,check-dotnet,check-cmake,check-ant-contrib"
/>
</project>
Modified: incubator/etch/trunk/build-support/etch.common.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.common.xml?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.common.xml (original)
+++ incubator/etch/trunk/build-support/etch.common.xml Mon Oct 22 12:25:06 2012
@@ -238,6 +238,7 @@
<property name="Etch.dependency.velocity-dep.jar" value="${build.velocity.lib}/velocity-1.7-dep.jar"
/>
<property name="Etch.dependency.ant-dotnet-1.1.jar" value="${build.ant-dotnet.lib}/ant-dotnet-1.1.jar"
/>
<property name="Etch.dependency.ant-cmake.jar" value="${build.ant-cmake.lib}/cmakeant.jar"
/>
+ <property name="Etch.dependency.ant-contrib.jar" value="${build.ant-contrib.lib}/ant-contrib-1.0b3.jar"
/>
<!-- Csharp Support -->
<condition property="USE.dotnet">
@@ -312,6 +313,9 @@
<!-- CMake ANT support -->
<taskdef onerror="report" name="cmake" classname="org.iainhull.ant.CmakeBuilder" classpath="${Etch.dependency.ant-cmake.jar}"/>
+ <!-- Ant contrib support -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${Etch.dependency.ant-contrib.jar}"/>
+
<!-- dependencies -->
<!-- TODO: remove clover reference if clover-disabled -->
<path id="Etch.dependencies.jar.paths">
Modified: incubator/etch/trunk/build.dependencies
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.dependencies?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
--- incubator/etch/trunk/build.dependencies (original)
+++ incubator/etch/trunk/build.dependencies Mon Oct 22 12:25:06 2012
@@ -39,6 +39,9 @@ ant-dotnet.lib=${env.ETCH_EXTERNAL_DEPEN
## CMake ANT support
ant-cmake.lib=${env.ETCH_EXTERNAL_DEPENDS}/apache-ant-cmake/1.0
+## Ant-contrib support
+ant-contrib.lib=${env.ETCH_EXTERNAL_DEPENDS}/ant-contrib/1.0b3
+
##
## Settings
##
Modified: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java?rev=1400861&r1=1400860&r2=1400861&view=diff
==============================================================================
(empty)
Propchange: incubator/etch/trunk/compiler/src/main/java/org/apache/etch/compiler/Version.java
------------------------------------------------------------------------------
svn:executable = *
Author: veithm
Date: Wed Oct 17 06:51:35 2012
New Revision: 1399123
URL: http://svn.apache.org/viewvc?rev=1399123&view=rev
Log:
ETCH-244 Fixing QueuedPool todo
Change-Id: I43f88546ad2e6212e6fa6f99baa822c85107b46d
Modified:
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp?rev=1399123&r1=1399122&r2=1399123&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Wed Oct 17
06:51:35 2012
@@ -88,9 +88,10 @@ status_t EtchQueuedPool::add(capu::Smart
if(!mIsOpen) {
return ETCH_EINVAL;
}
+ if(mPool->getSize() + 1 > mSizeMax)
+ return ETCH_ENOT_SUPPORTED;
EtchQueuedPoolRunnable* pr = new EtchQueuedPoolRunnable(this, runnable);
- //TODO: check max Size before adding a new Runnable
capu::status_t status = mPool->add(pr);
if(status != capu::CAPU_OK) {
return ETCH_ERROR;
Author: veithm
Date: Wed Oct 17 06:51:30 2012
New Revision: 1399122
URL: http://svn.apache.org/viewvc?rev=1399122&view=rev
Log:
ETCH-243 Small fixes in code generation
Change-Id: Ie04cb8b984f9fe3cdc6979da06c9346615f868c2
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java?rev=1399122&r1=1399121&r2=1399122&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
Wed Oct 17 06:51:30 2012
@@ -1184,25 +1184,26 @@ public class Compiler extends Backend {
private String getNativeArrayTypeName(TypeRef type) {
Token t = type.type();
+ String nativeArrayName = "EtchNativeArray";
switch (t.kind) {
case EtchGrammarConstants.BOOLEAN:
- return "Bool";
+ return nativeArrayName + "Bool";
case EtchGrammarConstants.BYTE:
- return "Byte";
+ return nativeArrayName + "Byte";
case EtchGrammarConstants.SHORT:
- return "Short";
+ return nativeArrayName + "Short";
case EtchGrammarConstants.INT:
- return "Int";
+ return nativeArrayName + "Int";
case EtchGrammarConstants.LONG:
- return "Long";
+ return nativeArrayName + "Long";
case EtchGrammarConstants.FLOAT:
- return "Float";
+ return nativeArrayName + "Float";
case EtchGrammarConstants.DOUBLE:
- return "Double";
+ return nativeArrayName + "Double";
case EtchGrammarConstants.STRING:
- return "String";
+ return nativeArrayName + "String";
case EtchGrammarConstants.OBJECT:
- return "Object";
+ return nativeArrayName + "Object";
default: {
// we have to use a fully qualified name here.
// find the actual type...
@@ -1213,12 +1214,12 @@ public class Compiler extends Backend {
"undefined or ambiguous name at line %d: %s", t.beginLine, t.image));
if (n.isBuiltin()) {
Builtin b = (Builtin) n;
- return b.className().substring(4);
+ return nativeArrayName + b.className().substring(4);
}
if (n.isEnumx()) {
- return n.efqname(this);
+ return nativeArrayName + n.efqname(this);
} else {
- return type.intf().name() + "::" + n.efqname(this);
+ return type.intf().name() + "::" + nativeArrayName + n.efqname(this);
}
}
}
@@ -1257,9 +1258,9 @@ public class Compiler extends Backend {
private String getArrayTypeName(TypeRef type, boolean pointer) {
// TODO Auto-generated method stub
if(pointer)
- return "EtchNativeArray" + this.getNativeArrayTypeName( type ) + "Ptr";
+ return this.getNativeArrayTypeName( type ) + "Ptr";
if (type.type().kind == EtchGrammarConstants.BYTE) {
- return "EtchNativeArray<" + this.getNativeTypeName( type, true ) + "> ";
+ return "EtchNativeArray<" + this.getNativeTypeName( type, false ) + "> ";
} else {
return "EtchNativeArray<" + this.getNativeTypeName( type, true ) + "Ptr> ";
}
@@ -1273,7 +1274,7 @@ public class Compiler extends Backend {
case EtchGrammarConstants.BOOLEAN:
return (etch_type ? "EtchBool" : "capu::bool_t");
case EtchGrammarConstants.BYTE:
- return (etch_type ? "capu::int8_t" : "capu::int8_t");
+ return (etch_type ? "EtchByte" : "capu::int8_t");
case EtchGrammarConstants.SHORT:
return (etch_type ? "EtchShort" : "capu::int16_t");
case EtchGrammarConstants.INT:
@@ -1299,6 +1300,7 @@ public class Compiler extends Backend {
if (n.isBuiltin()) {
Builtin b = (Builtin) n;
if (n.efqname(this).equals("EtchDate")) return b.className();
+ if (n.efqname(this).equals("EtchList")) return b.className()+"<EtchObjectPtr>
";
if (n.efqname(this).equals("EtchHashTable")) return b.className()+"<EtchObjectPtr,
EtchObjectPtr> ";
if (n.efqname(this).equals("EtchHashSet")) return b.className()+"<EtchObjectPtr>
";
throw new IllegalArgumentException(String.format(
@@ -1507,7 +1509,9 @@ public class Compiler extends Backend {
if (n.efqname(this).equals("EtchHashSet")) {
cn += "<EtchObjectPtr>";
}
-
+ if (n.efqname(this).equals("EtchList")) {
+ cn += "<EtchObjectPtr>";
+ }
/*
* int i = cn.indexOf( '<' ); if (i >= 0) cn = cn.substring( 0, i );
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm?rev=1399122&r1=1399121&r2=1399122&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
Wed Oct 17 06:51:30 2012
@@ -83,7 +83,7 @@ $class::$n.name()::$n.name()()
*/
$class::$n.name()::$n.name()(#set($sep = "")#foreach($i in $n.getAllParameters())$sep$helper.getEtchTypeName($i.type(),
true) $i.name() #set( $sep = ", " )#end)
#if($n.hasExtends())
- : $n.name()(#set($sep = "")#foreach($i in $n.getExtends().getAllParameters())$sep$i.name()#set(
$sep = ", " ))#end
+ : $n.getExtends().name()(#set($sep = "")#foreach($i in $n.getExtends().getAllParameters())$sep$i.name()#set(
$sep = ", " )#end)
#else
#if($n.isExcept())
: EtchException("${n.name()}", ETCH_ERROR, EXCPTYPE_USERDEFINED)
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1399122&r1=1399121&r2=1399122&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
Wed Oct 17 06:51:30 2012
@@ -80,11 +80,12 @@ public:
$helper.getEtchTypeName($param.type(), true) val$count = capu::smartpointer_cast<$helper.getEtchTypeName($param.type(),
false)>(obj$count);
#end
+## TODO: ADD AUTHENTICATION CODE HERE! ############################
$intfname::$mthd.name()AsyncResultPtr ar;
#set($sep = "")
#set($count = 0)
CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Calling implementation
of \"$mthd.name()\" function.");
- ar = _obj->$mthd.name()(#foreach($param in $mthd.iterator())#if($mthd.hasAuth())${sep}$param.name()#else#set($count
= $count + 1)${sep}val$count#end#set($sep = ", ")#end);
+ ar = _obj->$mthd.name()(#foreach($param in $mthd.iterator())#set($count = $count +
1)${sep}val$count#set($sep = ", ")#end);
// create result message
#if($mthd.hasReturn())
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1399122&r1=1399121&r2=1399122&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
Wed Oct 17 06:51:30 2012
@@ -106,9 +106,16 @@ public:
#elseif ($n.isEnumx())
#set( $tname = $n.efqname( $helper ) )
-class ImportExportHelper$n.vname( $helper )
- : public EtchImportExportHelper {
- public:
+class ImportExportHelper$n.vname( $helper )
+: public EtchImportExportHelper {
+public:
+ ImportExportHelper$n.vname($helper)(EtchRuntime* runtime)
+ : EtchImportExportHelper(runtime) {
+ }
+
+ virtual ~ImportExportHelper$n.vname($helper)() {
+ }
+
status_t exportValue(EtchValueFactory* vf, EtchObjectPtr value, EtchStructValue *&result)
{
EtchStructValue* _struct = new EtchStructValue( $vf::${n.vname( $helper )}, vf );
Author: veithm
Date: Wed Oct 17 06:51:22 2012
New Revision: 1399121
URL: http://svn.apache.org/viewvc?rev=1399121&view=rev
Log:
ETCH-243 Added same hash function for numeric datatypes
Change-Id: If543cc7718e2548d44bac3e674bd0bb58fae65a1
Modified:
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp?rev=1399121&r1=1399120&r2=1399121&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp Wed Oct 17 06:51:22
2012
@@ -74,9 +74,7 @@ EtchByte& EtchByte::operator=(EtchByte c
}
capu::uint32_t EtchByte::getHashCode() const{
- //For better distribution
- capu::uint32_t result = mValue + 128;
- return result;
+ return static_cast<capu::uint32_t>(mValue);
}
capu::int64_t EtchByte::getLongValue() const {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp?rev=1399121&r1=1399120&r2=1399121&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp Wed Oct 17 06:51:22
2012
@@ -47,9 +47,7 @@ capu::int16_t EtchShort::get() {
}
capu::uint32_t EtchShort::getHashCode() const {
- //for better distribution
- capu::uint32_t result = mValue + 32768;
- return result;
+ return static_cast<capu::uint32_t>(mValue);
}
capu::bool_t EtchShort::equals(const EtchObject * other) const {
Author: veithm
Date: Wed Oct 17 06:51:17 2012
New Revision: 1399120
URL: http://svn.apache.org/viewvc?rev=1399120&view=rev
Log:
ETCH-246 Fixed multidimensional array serialization
Serialization of empty values fixed
Change-Id: I3c86300193e3db9bc5aee7be3033a3812d0870b9
Modified:
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp?rev=1399120&r1=1399119&r2=1399120&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp Wed Oct 17
06:51:17 2012
@@ -102,9 +102,6 @@ status_t EtchArrayValue::get(capu::uint3
}
status_t EtchArrayValue::add(capu::SmartPointer<EtchObject> value) {
- if (value.get() == NULL) {
- return ETCH_EINVAL;
- }
//check if we have to resize the array
capu::int32_t n = mSize;
Author: veithm
Date: Wed Oct 17 06:51:12 2012
New Revision: 1399119
URL: http://svn.apache.org/viewvc?rev=1399119&view=rev
Log:
Etch-243 Added EtchByte operator=
Useful in Stubhelpers
Change-Id: I681f8fbceb6dd3f0d73cf4b60c0143c8340ac25e
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h?rev=1399119&r1=1399118&r2=1399119&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h Wed Oct 17 06:51:12
2012
@@ -70,6 +70,16 @@ public:
capu::uint32_t getHashCode() const;
/**
+ * Operator= for numeric Values
+ */
+ capu::int8_t& operator=(capu::int8_t const& other);
+
+ /**
+ * Operator= for EtchByte Objects
+ */
+ EtchByte& operator=(EtchByte const& other);
+
+ /**
* @see EtchNumber
*/
capu::int64_t getLongValue() const;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp?rev=1399119&r1=1399118&r2=1399119&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp Wed Oct 17 06:51:12
2012
@@ -55,6 +55,24 @@ capu::bool_t EtchByte::equals(const Etch
return (a->mValue == this->mValue);
}
+capu::int8_t& EtchByte::operator=(capu::int8_t const& other)
+{
+ if(mValue != other)
+ {
+ mValue = other;
+ }
+ return mValue;
+}
+
+EtchByte& EtchByte::operator=(EtchByte const& other)
+{
+ if(mValue != other.mValue)
+ {
+ mValue = other.mValue;
+ }
+ return *this;
+}
+
capu::uint32_t EtchByte::getHashCode() const{
//For better distribution
capu::uint32_t result = mValue + 128;
Author: veithm
Date: Wed Oct 17 06:51:06 2012
New Revision: 1399118
URL: http://svn.apache.org/viewvc?rev=1399118&view=rev
Log:
ETCH-243 Refactored EtchObjectType hashing
Separate of hash and comparator functionality from EtchObject
Change-Id: I499a46ad0d77899eccd54f41471e4e17b71eac42
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h?rev=1399118&r1=1399117&r2=1399118&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h Wed Oct 17 06:51:06
2012
@@ -29,10 +29,6 @@ public:
inline capu::bool_t operator() (const EtchObject &first, const EtchObject &second)
const {
return first.equals(&second);
}
-
- inline capu::bool_t operator() (const EtchObjectType &first, const EtchObjectType &second)
const {
- return first.equals(&second);
- }
};
template <class T>
@@ -42,10 +38,6 @@ public:
inline capu::bool_t operator() (const EtchObject* first, const EtchObject* second) const
{
return first->equals(second);
}
-
- inline capu::bool_t operator() (const EtchObjectType* first, const EtchObjectType* second)
const {
- return first->equals(second);
- }
};
template <class T>
@@ -55,10 +47,6 @@ public:
inline capu::bool_t operator() (const capu::SmartPointer<EtchObject>& first,
const capu::SmartPointer<EtchObject>& second) const {
return first->equals(second.get());
}
-
- inline capu::bool_t operator() (const capu::SmartPointer<EtchObjectType>& first,
const capu::SmartPointer<EtchObjectType>& second) const {
- return first->equals(second.get());
- }
};
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h?rev=1399118&r1=1399117&r2=1399118&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h Wed Oct 17 06:51:06
2012
@@ -35,18 +35,6 @@ public:
static capu::uint32_t Digest(const capu::SmartPointer<EtchObject>& key) {
return key->getHashCode();
}
-
- static capu::uint32_t Digest(const EtchObjectType &key) {
- return key.getHashCode();
- }
-
- static capu::uint32_t Digest(const EtchObjectType* key) {
- return key->getHashCode();
- }
-
- static capu::uint32_t Digest(const capu::SmartPointer<EtchObjectType>& key) {
- return key->getHashCode();
- }
};
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h?rev=1399118&r1=1399117&r2=1399118&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h Wed
Oct 17 06:51:06 2012
@@ -64,8 +64,50 @@ public:
*/
void lock();
+ /**
+ * Hashing Functions for the EtchClass2TypeMap
+ */
+ class Hash {
+ public:
+ static capu::uint32_t Digest(const EtchObjectType &key) {
+ return key.getHashCode();
+ }
+
+ static capu::uint32_t Digest(const EtchObjectType* key) {
+ return key->getHashCode();
+ }
+
+ static capu::uint32_t Digest(const capu::SmartPointer<EtchObjectType>& key)
{
+ return key->getHashCode();
+ }
+ };
+
+ /**
+ * Comperator Functions for the EtchClass2TypeMap
+ */
+ template <class T>
+ class Comparator {
+ public:
+ inline capu::bool_t operator() (const EtchObjectType &first, const EtchObjectType
&second) const {
+ return first.equals(&second);
+ }
+ };
+ template <class T>
+ class Comparator <T*> {
+ public:
+ inline capu::bool_t operator() (const EtchObjectType* first, const EtchObjectType* second)
const {
+ return first->equals(second);
+ }
+ };
+ template <class T>
+ class Comparator <capu::SmartPointer<T> > {
+ public:
+ inline capu::bool_t operator() (const capu::SmartPointer<EtchObjectType>& first,
const capu::SmartPointer<EtchObjectType>& second) const {
+ return first->equals(second.get());
+ }
+ };
private:
- EtchHashTable<const EtchObjectType*, EtchType* > mC2T;
+ EtchHashTable<const EtchObjectType*, EtchType*, EtchClass2TypeMap::Hash, EtchClass2TypeMap::Comparator<const
EtchObjectType*> > mC2T;
capu::bool_t mLocked;
Author: veithm
Date: Wed Oct 17 06:50:55 2012
New Revision: 1399117
URL: http://svn.apache.org/viewvc?rev=1399117&view=rev
Log:
ETCH-243 Cleaned Up include dependencies
Change-Id: I6630eac7565d4c7d1eff47eeaa0cd66a59a29c2e
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchString.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchFieldMap.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedData.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSession.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionData.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionListener.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionMessage.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionPacket.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpOption.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportData.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/util/EtchURL.h
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObjectType.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,6 @@
#define __ETCHBOOL_H__
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchBool :
public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h Wed Oct 17 06:50:55 2012
@@ -18,8 +18,8 @@
#ifndef ETCHDATE_H
#define ETCHDATE_H
+
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
class EtchDate : public EtchObject {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,6 @@
#define __ETCHDOUBLE_H__
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchDouble :
public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h Wed Oct 17 06:50:55 2012
@@ -19,7 +19,6 @@
#ifndef __ETCHEXCEPTION_H__
#define __ETCHEXCEPTION_H__
-#include "common/EtchObject.h"
#include "common/EtchString.h"
class EtchException : public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,6 @@
#define __ETCHFLOAT_H__
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchFloat :
public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h Wed Oct 17 06:50:55 2012
@@ -18,15 +18,11 @@
#ifndef __ETCHSET_H__
#define __ETCHSET_H__
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
+
#include "common/EtchObjectHash.h"
#include "common/EtchComparator.h"
#include "capu/container/HashSet.h"
-
-
template <class T, class H = EtchObjectHash, class C = EtchComparator<T> >
class EtchHashSet : public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h Wed Oct 17 06:50:55 2012
@@ -19,9 +19,6 @@
#ifndef __ETCHHASHTABLE_H__
#define __ETCHHASHTABLE_H__
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
#include "common/EtchObjectHash.h"
#include "common/EtchComparator.h"
#include "capu/container/HashTable.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h Wed Oct 17 06:50:55 2012
@@ -20,9 +20,6 @@
#define __ETCHLIST_H__
#include "capu/container/List.h"
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
#include "common/EtchComparator.h"
template <class T, class C = EtchComparator<T> >
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,6 @@
#define __ETCHLONG_H__
#include "common/EtchNumber.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchLong :
public EtchNumber {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h Wed Oct 17 06:50:55 2012
@@ -20,9 +20,6 @@
#define __ETCHNATIVEARRAY_H__
#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
#include "common/EtchTypes.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h Wed Oct 17 06:50:55 2012
@@ -19,11 +19,10 @@
#ifndef __ETCHOBJECT_H__
#define __ETCHOBJECT_H__
-#include "capu/util/SmartPointer.h"
#include "capu/container/List.h"
-#include "common/EtchError.h"
-class EtchObjectType;
+#include "common/EtchError.h"
+#include "common/EtchObjectType.h"
class EtchObject {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h Wed Oct 17 06:50:55 2012
@@ -22,7 +22,6 @@
#define __ETCHOBJECTTYPE_H__
#include "EtchConfig.h"
-#include "common/EtchObject.h"
#include "capu/util/SmartPointer.h"
enum EtchObjectTypeIds {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h Wed Oct 17 06:50:55 2012
@@ -20,7 +20,6 @@
#define __ETCHRUNTIMEEXCEPTION_H__
#include "common/EtchException.h"
-#include "common/EtchError.h"
class EtchRuntimeException : public EtchException {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h Wed Oct 17 06:50:55 2012
@@ -19,10 +19,8 @@
#ifndef __ETCHSERVERSOCKET_H__
#define __ETCHSERVERSOCKET_H__
-
#include "capu/os/ServerSocket.h"
#include "capu/os/Socket.h"
-#include "capu/util/SmartPointer.h"
#include "common/EtchSocket.h"
class EtchServerSocket : public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,6 @@
#define __ETCHSHORT_H__
#include "common/EtchNumber.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchShort :
public EtchNumber {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h Wed Oct 17 06:50:55 2012
@@ -18,10 +18,9 @@
#ifndef __ETCHSOCKET_H__
#define __ETCHSOCKET_H__
+
#include "capu/os/Socket.h"
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchSocket : public EtchObject {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchString.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchString.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchString.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchString.h Wed Oct 17 06:50:55 2012
@@ -19,9 +19,7 @@
#ifndef __ETCHSTRING_H__
#define __ETCHSTRING_H__
-#include "common/EtchError.h"
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
/**
* String type.
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h Wed Oct 17 06:50:55 2012
@@ -23,8 +23,6 @@
#include "common/EtchAuthenticationException.h"
#include "serialization/EtchImportExportHelper.h"
#include "serialization/EtchStructValue.h"
-#include "serialization/EtchType.h"
-#include "serialization/EtchField.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorString.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedData.h Wed Oct 17 06:50:55 2012
@@ -19,17 +19,7 @@
#ifndef __ETCHBINARYTAGGEDDATA_H__
#define __ETCHBINARYTAGGEDDATA_H__
-#include "capu/util/SmartPointer.h"
-#include "common/EtchObject.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchInt32.h"
-#include "common/EtchLong.h"
-#include "common/EtchFloat.h"
-#include "common/EtchDouble.h"
-#include "common/EtchNativeArray.h"
-#include "serialization/EtchValueFactory.h"
+#include "common/EtchTypes.h"
#include "serialization/EtchTypeCodes.h"
#include "serialization/EtchTaggedData.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchClass2TypeMap.h Wed Oct 17 06:50:55 2012
@@ -20,7 +20,6 @@
#ifndef __ETCHCLASS2TYPEMAP_H__
#define __ETCHCLASS2TYPEMAP_H__
-#include "capu/util/SmartPointer.h"
#include "common/EtchInt32.h"
#include "serialization/EtchType.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h Wed Oct 17 06:50:55 2012
@@ -23,7 +23,6 @@
#include "serialization/EtchImportExportHelper.h"
#include "serialization/EtchStructValue.h"
#include "serialization/EtchField.h"
-#include "serialization/EtchType.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorLong.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchFieldMap.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchFieldMap.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchFieldMap.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchFieldMap.h Wed Oct 17 06:50:55 2012
@@ -20,8 +20,8 @@
#define __ETCHFIELDMAP_H__
#include "common/EtchString.h"
-#include "serialization/EtchField.h"
#include "common/EtchHashTable.h"
+#include "serialization/EtchField.h"
/**
* Mapping of id and name to EtchField
@@ -84,7 +84,7 @@ public:
*/
capu::int32_t size();
-
+
/**
* @return the iterator
*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h Wed Oct 17 06:50:55 2012
@@ -27,7 +27,6 @@
#include "serialization/EtchType.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorObject.h"
-#include "serialization/EtchValidatorObject.h"
class EtchRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h Wed Oct 17 06:50:55 2012
@@ -24,7 +24,6 @@
#include "serialization/EtchImportExportHelper.h"
#include "serialization/EtchStructValue.h"
#include "serialization/EtchField.h"
-#include "serialization/EtchType.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorObject.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h Wed Oct 17 06:50:55 2012
@@ -25,7 +25,6 @@
#include "serialization/EtchImportExportHelper.h"
#include "serialization/EtchStructValue.h"
#include "serialization/EtchType.h"
-#include "serialization/EtchField.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorString.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h Wed Oct 17 06:50:55 2012
@@ -24,7 +24,6 @@
#include "common/EtchNativeArray.h"
#include "serialization/EtchImportExportHelper.h"
#include "serialization/EtchStructValue.h"
-#include "serialization/EtchField.h"
#include "serialization/EtchType.h"
#include "serialization/EtchClass2TypeMap.h"
#include "serialization/EtchValidatorObject.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedData.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedData.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedData.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedData.h Wed Oct 17 06:50:55 2012
@@ -20,10 +20,8 @@
#define __ETCHTAGGEDDATA_H__
#include "serialization/EtchValueFactory.h"
#include "serialization/EtchValidatorStructValue.h"
-#include "serialization/EtchType.h"
-#include "common/EtchArrayValue.h"
#include "serialization/EtchTypeCodes.h"
-#include "common/EtchObject.h"
+#include "common/EtchArrayValue.h"
#include "common/EtchNativeArray.h"
class EtchTaggedData {
@@ -57,7 +55,7 @@ protected:
* @param result the allocated array value.
* @return ETCH_OK if array is successfully allocated
* ETCH_ENO_MEMORY if mem allocation fails
- *
+ *
*/
status_t allocNativeArray(capu::int8_t typeCode, EtchType* customStructType, capu::int32_t dim, capu::int32_t length, capu::SmartPointer<EtchNativeArrayBase> &result);
@@ -110,7 +108,7 @@ public:
/**
* @param c typeid
- * @param result out buffet
+ * @param result out buffet
*/
virtual status_t getCustomStructType(const EtchObjectType* c, EtchType*& result) = 0;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTaggedDataInput.h Wed Oct 17 06:50:55 2012
@@ -20,7 +20,6 @@
#define __ETCHTAGGEDDATAINPUT_H__
#include "transport/EtchFlexBuffer.h"
#include "transport/EtchMessage.h"
-#include "capu/util/SmartPointer.h"
class EtchTaggedDataInput {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h Wed Oct 17 06:50:55 2012
@@ -19,7 +19,6 @@
#ifndef __ETCHTYPE_H__
#define __ETCHTYPE_H__
-#include "capu/util/SmartPointer.h"
#include "common/EtchString.h"
#include "common/EtchHashTable.h"
#include "serialization/EtchDirection.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h Wed Oct 17 06:50:55 2012
@@ -19,10 +19,7 @@
#ifndef __ETCHVALIDATOR_H__
#define __ETCHVALIDATOR_H__
-#include "capu/util/SmartPointer.h"
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
#include "support/EtchRuntime.h"
class EtchValidator : public EtchObject {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h Wed Oct 17 06:50:55 2012
@@ -24,7 +24,6 @@
#include "common/EtchShort.h"
#include "common/EtchInt32.h"
#include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
#include "common/EtchNativeArray.h"
#include "capu/os/NumericLimits.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h Wed Oct 17 06:50:55 2012
@@ -18,12 +18,12 @@
#ifndef __ETCHVALIDATORDOUBLE_H__
#define __ETCHVALIDATORDOUBLE_H__
+
#include "serialization/EtchTypeValidator.h"
#include "common/EtchFloat.h"
#include "common/EtchDouble.h"
-#include "serialization/EtchTypeCodes.h"
-#include "capu/os/NumericLimits.h"
#include "common/EtchNativeArray.h"
+#include "capu/os/NumericLimits.h"
class EtchRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h Wed Oct 17 06:50:55 2012
@@ -22,7 +22,6 @@
#include "serialization/EtchTypeValidator.h"
#include "common/EtchDouble.h"
#include "common/EtchFloat.h"
-#include "serialization/EtchTypeCodes.h"
#include "common/EtchNativeArray.h"
class EtchRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h Wed Oct 17 06:50:55 2012
@@ -24,7 +24,6 @@
#include "common/EtchShort.h"
#include "common/EtchInt32.h"
#include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
#include "common/EtchNativeArray.h"
#include "capu/os/NumericLimits.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h Wed Oct 17 06:50:55 2012
@@ -23,7 +23,6 @@
#include "common/EtchShort.h"
#include "common/EtchInt32.h"
#include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
#include "common/EtchNativeArray.h"
#include "capu/os/NumericLimits.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h Wed Oct 17 06:50:55 2012
@@ -24,7 +24,6 @@
#include "common/EtchShort.h"
#include "common/EtchInt32.h"
#include "common/EtchLong.h"
-#include "serialization/EtchTypeCodes.h"
#include "common/EtchNativeArray.h"
#include "capu/os/NumericLimits.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h Wed Oct 17 06:50:55 2012
@@ -20,11 +20,9 @@
#ifndef __ETCHVALUEFACTORY_H__
#define __ETCHVALUEFACTORY_H__
-
-#include "serialization/EtchLevel.h"
#include "common/EtchString.h"
+#include "serialization/EtchLevel.h"
#include "serialization/EtchField.h"
-#include "capu/util/SmartPointer.h"
class EtchStructValue;
class EtchMessage;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h Wed Oct 17 06:50:55 2012
@@ -21,11 +21,9 @@
#include "capu/os/Mutex.h"
#include "capu/os/Thread.h"
-#include "capu/util/SmartPointer.h"
#include "common/EtchError.h"
#include "common/EtchException.h"
#include "common/EtchInt32.h"
-#include "common/EtchObject.h"
#include "common/EtchString.h"
#include "support/EtchMonitor.h"
#include "transport/EtchSession.h"
@@ -155,7 +153,7 @@ capu::Mutex EtchConnection<S>::mMutexCon
template <class S>
EtchConnection<S>::EtchConnection()
-: mStatus(EtchString("status"), EtchSession::DOWN()) {
+: mSession(0), mThread(0), mStatus(EtchString("status"), EtchSession::DOWN()) {
}
template <class S>
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h Wed Oct 17 06:50:55 2012
@@ -20,7 +20,6 @@
#ifndef __ETCHMESSAGE_H__
#define __ETCHMESSAGE_H__
-#include "capu/util/SmartPointer.h"
#include "serialization/EtchType.h"
#include "serialization/EtchValueFactory.h"
#include "serialization/EtchStructValue.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h Wed Oct 17 06:50:55 2012
@@ -19,12 +19,8 @@
#ifndef __ETCHMESSAGIZER_H__
#define __ETCHMESSAGIZER_H__
-#include "capu/util/SmartPointer.h"
#include "capu/os/Mutex.h"
#include "common/EtchException.h"
-#include "serialization/EtchTaggedDataInput.h"
-#include "serialization/EtchTaggedDataOutput.h"
-#include "serialization/EtchBinaryTaggedData.h"
#include "serialization/EtchBinaryTaggedDataInput.h"
#include "serialization/EtchBinaryTaggedDataOutput.h"
#include "transport/EtchFormat.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSession.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSession.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSession.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSession.h Wed Oct 17 06:50:55 2012
@@ -19,10 +19,7 @@
#ifndef __ETCHSESSION_H__
#define __ETCHSESSION_H__
-#include "capu/util/SmartPointer.h"
-#include "common/EtchObject.h"
#include "common/EtchString.h"
-#include "common/EtchError.h"
class EtchSession {
public:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionData.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionData.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionData.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionData.h Wed Oct 17 06:50:55 2012
@@ -19,7 +19,6 @@
#ifndef __ETCHSESSIONDATA_H__
#define __ETCHSESSIONDATA_H__
-#include "capu/util/SmartPointer.h"
#include "common/EtchError.h"
#include "transport/EtchFlexBuffer.h"
#include "transport/EtchSession.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionListener.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionListener.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionListener.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionListener.h Wed Oct 17 06:50:55 2012
@@ -19,8 +19,6 @@
#ifndef __ETCHSESSIONLISTENER_H__
#define __ETCHSESSIONLISTENER_H__
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
#include "transport/EtchSession.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionMessage.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionMessage.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionMessage.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionMessage.h Wed Oct 17 06:50:55 2012
@@ -19,8 +19,6 @@
#ifndef __ETCHSESSIONMESSAGE_H__
#define __ETCHSESSIONMESSAGE_H__
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
#include "transport/EtchSession.h"
#include "transport/EtchWho.h"
#include "transport/EtchMessage.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionPacket.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionPacket.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionPacket.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchSessionPacket.h Wed Oct 17 06:50:55 2012
@@ -19,7 +19,6 @@
#ifndef __ETCHSESSIONPACKET_H__
#define __ETCHSESSIONPACKET_H__
-#include "capu/util/SmartPointer.h"
#include "transport/EtchSession.h"
#include "transport/EtchFlexBuffer.h"
#include "transport/EtchWho.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h Wed Oct 17 06:50:55 2012
@@ -20,9 +20,6 @@
#define __ETCHTCPCONNECTION_H__
#include "capu/util/Runnable.h"
-
-#include "common/EtchObject.h"
-#include "common/EtchError.h"
#include "common/EtchString.h"
#include "common/EtchSocket.h"
#include "support/EtchRuntime.h"
@@ -35,7 +32,6 @@
#include "util/EtchResources.h"
#include "util/EtchLogger.h"
-class EtchRuntime;
/**
* Implementation of connection which handles a tcp connection.
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h Wed Oct 17 06:50:55 2012
@@ -23,7 +23,6 @@
#include "capu/os/ServerSocket.h"
#include "capu/os/Socket.h"
#include "capu/util/Runnable.h"
-#include "capu/util/SmartPointer.h"
#include "common/EtchError.h"
#include "common/EtchObject.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpOption.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpOption.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpOption.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpOption.h Wed Oct 17 06:50:55 2012
@@ -19,7 +19,6 @@
#ifndef __ETCHTCPOPTION_H__
#define __ETCHTCPOPTION_H__
-#include "common/EtchString.h"
#include "util/EtchURL.h"
class EtchTcpOption {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h Wed Oct 17 06:50:55 2012
@@ -26,7 +26,6 @@
#include "support/EtchStack.h"
#include "transport/EtchTransportMessage.h"
#include "transport/EtchTransportData.h"
-#include "transport/EtchTcpConnection.h"
#include "transport/EtchTransportPacket.h"
#include "transport/EtchPacketizer.h"
#include "transport/EtchTcpConnection.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h Wed Oct 17 06:50:55 2012
@@ -19,9 +19,6 @@
#ifndef __ETCHTRANSPORT_H__
#define __ETCHTRANSPORT_H__
-#include "capu/util/SmartPointer.h"
-#include "common/EtchError.h"
-#include "common/EtchObject.h"
#include "common/EtchString.h"
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportData.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportData.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportData.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportData.h Wed Oct 17 06:50:55 2012
@@ -18,7 +18,7 @@
#ifndef __ETCHTRANSPORTDATA_H__
#define __ETCHTRANSPORTDATA_H__
-#include "capu/util/SmartPointer.h"
+
#include "transport/EtchSessionData.h"
#include "transport/EtchTransport.h"
#include "transport/EtchFlexBuffer.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportFactory.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportFactory.h Wed Oct 17 06:50:55 2012
@@ -22,7 +22,6 @@
#define __ETCHTRANSPORTFACTORY_H__
#include "common/EtchTypes.h"
-#include "common/EtchError.h"
#include "support/EtchServerFactory.h"
#include "transport/EtchTransport.h"
#include "transport/EtchTransportMessage.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/include/util/EtchURL.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/util/EtchURL.h?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/util/EtchURL.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/util/EtchURL.h Wed Oct 17 06:50:55 2012
@@ -18,7 +18,7 @@
#ifndef __ETCHURL_H__
#define __ETCHURL_H__
-#include "common/EtchError.h"
+
#include "common/EtchString.h"
#include "common/EtchHashTable.h"
#include "common/EtchList.h"
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp Wed Oct 17 06:50:55 2012
@@ -19,19 +19,7 @@
*/
#include "common/EtchArrayValue.h"
-#include "common/EtchObject.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchList.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
+#include "common/EtchTypes.h"
const EtchObjectType* EtchArrayValue::TYPE() {
static const EtchObjectType TYPE(EOTID_ARRAY_VALUE, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp Wed Oct 17 06:50:55 2012
@@ -17,8 +17,6 @@
*/
#include "common/EtchInt32.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
const EtchObjectType* EtchInt32::TYPE() {
const static EtchObjectType TYPE(EOTID_INT32, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp Wed Oct 17 06:50:55 2012
@@ -17,18 +17,6 @@
*/
#include "common/EtchNativeArray.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
-#include "common/EtchList.h"
status_t EtchNativeArrayBase::getBase(Pos pos, capu::SmartPointer<EtchObject> &result) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp Wed Oct 17 06:50:55 2012
@@ -17,7 +17,6 @@
*/
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
const EtchObjectType* EtchObject::TYPE() {
const static EtchObjectType TYPE(EOTID_OBJECT, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObjectType.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObjectType.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObjectType.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObjectType.cpp Wed Oct 17 06:50:55 2012
@@ -18,8 +18,6 @@
* under the License.
*/
#include "common/EtchObjectType.h"
-#include "common/EtchObject.h"
-
const EtchObjectType& EtchObjectType::NATIVE_INT8() {
static const EtchObjectType type(EOTID_BYTE, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp Wed Oct 17 06:50:55 2012
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include "common/EtchServerSocket.h"
#include "capu/util/SmartPointer.h"
-#include "common/EtchSocket.h"
const EtchObjectType* EtchServerSocket::TYPE() {
const static EtchObjectType TYPE(EOTID_SERVER_SOCKET, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp?rev=1399117&r1=1399116&r2=1399117&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTaggedData.cpp Wed Oct 17 06:50:55 2012
@@ -17,19 +17,7 @@
*/
#include "serialization/EtchTaggedData.h"
-#include "common/EtchObject.h"
-#include "common/EtchInt32.h"
-#include "common/EtchBool.h"
-#include "common/EtchByte.h"
-#include "common/EtchShort.h"
-#include "common/EtchLong.h"
-#include "common/EtchDouble.h"
-#include "common/EtchFloat.h"
-#include "common/EtchString.h"
-#include "common/EtchDate.h"
-#include "common/EtchList.h"
-#include "common/EtchHashTable.h"
-#include "common/EtchHashSet.h"
+#include "common/EtchTypes.h"
EtchTaggedData::EtchTaggedData(EtchValueFactory* vf)
: mVf(vf) {
@@ -169,4 +157,4 @@ status_t EtchTaggedData::findStructValue
}
}
return ETCH_ERROR;
-}
\ No newline at end of file
+}
Author: veithm
Date: Wed Oct 17 06:50:36 2012
New Revision: 1399116
URL: http://svn.apache.org/viewvc?rev=1399116&view=rev
Log:
ETCH-243 Small Fixes
Added virtual destructors
Added custom HashTable sizes inside of EtchConfig.h
Added some logging
Change-Id: I97cc1778909d9882c2b42cf7833b02bd29dd2f0d
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchConfig.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchObjectSession.h
incubator/etch/trunk/binding-cpp/runtime/include/util/EtchResources.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/util/ThreadPool.h
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchFieldMap.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchConfig.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchConfig.h?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchConfig.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchConfig.h Wed Oct 17 06:50:36
2012
@@ -1,19 +1,19 @@
-/* $Id$
- *
- * 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,
+/* $Id$
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#ifndef __ETCHCONFIG_H__
@@ -25,10 +25,24 @@
#include "capu/Config.h"
-//Hash table size
-#define ETCH_DEFAULT_HASH_TABLE_SIZE 1000
+/**
+ * Hash table size
+ */
+#define ETCH_DEFAULT_HASH_TABLE_SIZE 1000
+
+#define ETCH_DEFAULT_TYPEMAP_HASH_SIZE 50
+#define ETCH_DEFAULT_C2TYPEMAP_HASH_SIZE 50
+#define ETCH_DEFAULT_FIELDMAP_HASH_SIZE 10
+#define ETCH_DEFAULT_STRUCTVALUE_HASH_SIZE 8
+#define ETCH_DEFAULT_TYPEVALIDATOR_HASH_SIZE 5
+#define ETCH_DEFAULT_CUSTOMVALIDATORCACHE_HASH_SIZE 100
+#define ETCH_DEFAULT_MAILBOXMANAGER_HASH_SIZE 300
+#define ETCH_DEFAULT_RESOURCES_HASH_SIZE 300
+#define ETCH_DEFAULT_URL_TERMS_HASH_SIZE 10
-//Socket input buffer size (bytes)
+/**
+ * Socket input buffer size (bytes)
+ */
#define ETCH_DEFAULT_SOCKET_INPUT_BUFFER_SIZE 8192
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h Wed Oct
17 06:50:36 2012
@@ -22,6 +22,7 @@
#include "capu/util/SmartPointer.h"
#include "common/EtchHashTable.h"
#include "common/EtchObject.h"
+#include "common/EtchConfig.h"
#include "serialization/EtchType.h"
#include "serialization/EtchLevel.h"
@@ -165,7 +166,7 @@ private:
static const capu::int64_t serialVersionUID = 1L;
//Default size of mTable
- static const capu::int32_t DEFAULT_SIZE = 8;
+ static const capu::int32_t DEFAULT_SIZE = ETCH_DEFAULT_STRUCTVALUE_HASH_SIZE;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchObjectSession.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchObjectSession.h?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchObjectSession.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchObjectSession.h Wed Oct 17
06:50:36 2012
@@ -32,6 +32,9 @@
class EtchObjectSession
{
public:
+
+ virtual ~EtchObjectSession() {}
+
/**
* Gets a configuration or operational value from the handler. The
* request is passed up the chain of sessions until some session
Modified: incubator/etch/trunk/binding-cpp/runtime/include/util/EtchResources.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/util/EtchResources.h?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/util/EtchResources.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/util/EtchResources.h Wed Oct 17 06:50:36
2012
@@ -83,7 +83,7 @@ public:
private:
EtchResources *mRelated;
- EtchHashTable <EtchString, EtchObject*> res;
+ EtchHashTable <EtchString, EtchObject*> mRes;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/util/ThreadPool.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/util/ThreadPool.h?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/util/ThreadPool.h
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/util/ThreadPool.h
Wed Oct 17 06:50:36 2012
@@ -114,8 +114,8 @@ namespace capu
class PoolWorker {
public:
- PoolWorker() {
- mPool = NULL;
+ PoolWorker()
+ : mPool(NULL), mPoolRunnable(NULL), mThread(NULL) {
}
PoolWorker(ThreadPool *pool, int32_t id)
@@ -144,7 +144,7 @@ namespace capu
ThreadPool *mPool;
PoolRunnable *mPoolRunnable;
Thread *mThread;
-
+
};
status_t init();
@@ -159,7 +159,7 @@ namespace capu
bool_t isClosed();
-
+
};
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
Wed Oct 17 06:50:36 2012
@@ -278,7 +278,6 @@ status_t EtchBinaryTaggedDataInput::read
capu::StringUtils::Sprintf(num, 100, "%d", id->get());
EtchString str(num);
type = new EtchType(id->get(), str);
- //TODO: Enhance memory management. We need smartpointers here because we create new
object sometimes
}
return ETCH_OK;
}
@@ -287,7 +286,6 @@ status_t EtchBinaryTaggedDataInput::read
EtchString* name = (EtchString*) obj.get();
if (mVf->getType(*name, type) != ETCH_OK) {
type = new EtchType(*name);
- //TODO: Enhance memory management. We need smartpointers here because we create new
object sometimes
}
return ETCH_OK;
}
@@ -436,7 +434,7 @@ status_t EtchBinaryTaggedDataInput::read
if (validateValue(v, boolean, result) != ETCH_OK) {
return ETCH_ERROR;
} else {
- CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean false value has been received");
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean true value has been received");
return ETCH_OK;
}
@@ -580,7 +578,7 @@ status_t EtchBinaryTaggedDataInput::read
return ETCH_ERROR;
} else {
result = array;
- CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Array hhas been received");
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Array has been received");
return ETCH_OK;
}
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
Wed Oct 17 06:50:36 2012
@@ -293,9 +293,15 @@ status_t EtchBinaryTaggedDataOutput::wri
switch (typeCode) {
case EtchTypeCode::Null:
case EtchTypeCode::NONE:
+ return ETCH_OK;
case EtchTypeCode::BOOLEAN_FALSE:
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean False has been serialized. (No
Data send - encoded via TypeId)");
+ return ETCH_OK;
case EtchTypeCode::BOOLEAN_TRUE:
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean True has been serialized. (No
Data send - encoded via TypeId)");
+ return ETCH_OK;
case EtchTypeCode::EMPTY_STRING:
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Empty String has been serialized. (No
Data send - encoded via TypeId)");
return ETCH_OK;
case EtchTypeCode::BYTE:
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
Wed Oct 17 06:50:36 2012
@@ -17,11 +17,12 @@
*/
#include "common/EtchHashTable.h"
+#include "common/EtchConfig.h"
#include "serialization/EtchType.h"
#include "serialization/EtchClass2TypeMap.h"
EtchClass2TypeMap::EtchClass2TypeMap()
-: mLocked(false) {
+: mC2T(ETCH_DEFAULT_C2TYPEMAP_HASH_SIZE), mLocked(false) {
}
EtchClass2TypeMap::~EtchClass2TypeMap() {
@@ -47,4 +48,4 @@ status_t EtchClass2TypeMap::put(const Et
void EtchClass2TypeMap::lock() {
mLocked = true;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchFieldMap.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchFieldMap.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchFieldMap.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchFieldMap.cpp Wed Oct
17 06:50:36 2012
@@ -15,10 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include "common/EtchConfig.h"
#include "serialization/EtchFieldMap.h"
EtchFieldMap::EtchFieldMap()
-: mLocked(false) {
+: mById(ETCH_DEFAULT_FIELDMAP_HASH_SIZE), mByName(ETCH_DEFAULT_FIELDMAP_HASH_SIZE), mLocked(false)
{
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp Wed Oct 17
06:50:36 2012
@@ -24,26 +24,26 @@ const EtchObjectType* EtchType::TYPE() {
return &TYPE;
}
EtchType::EtchType()
-: mId(0), mTimeout(0), mName(""), mSuperType(NULL), mResultType(NULL),
+: mValidatorMap(ETCH_DEFAULT_TYPEVALIDATOR_HASH_SIZE), mId(0), mTimeout(0), mName(""), mSuperType(NULL),
mResultType(NULL),
mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL),
mStubHelper(NULL) {
addObjectType(TYPE());
}
EtchType::EtchType(EtchString name)
-: mTimeout(0), mName(name), mSuperType(NULL),
+: mValidatorMap(ETCH_DEFAULT_TYPEVALIDATOR_HASH_SIZE), mTimeout(0), mName(name), mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL),
mHelper(NULL), mStubHelper(NULL) {
mId = EtchHashEx::Digest(mName);
addObjectType(TYPE());
}
EtchType::EtchType(capu::uint32_t id, EtchString name)
-: mId(id), mTimeout(0), mName(name), mSuperType(NULL),
+: mValidatorMap(ETCH_DEFAULT_TYPEVALIDATOR_HASH_SIZE), mId(id), mTimeout(0), mName(name),
mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL),
mHelper(NULL), mStubHelper(NULL) {
addObjectType(TYPE());
}
EtchType::EtchType(const EtchType& other)
- : EtchObject(other), mId(other.mId), mTimeout(other.mTimeout), mName(other.mName), mSuperType(other.mSuperType),
+ : EtchObject(other), mValidatorMap(ETCH_DEFAULT_TYPEVALIDATOR_HASH_SIZE), mId(other.mId),
mTimeout(other.mTimeout), mName(other.mName), mSuperType(other.mSuperType),
mResultType(other.mResultType), mDirection(other.mDirection), mAsyncMode(other.mAsyncMode),
mLocked(other.mLocked),
mComponentType(other.mComponentType), mHelper(other.mHelper), mStubHelper(other.mStubHelper)
{
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp Wed Oct
17 06:50:36 2012
@@ -15,12 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include "common/EtchConfig.h"
#include "serialization/EtchTypeMap.h"
// TODO: Check memory handling
EtchTypeMap::EtchTypeMap()
-: mLocked(false) {
+: mById(ETCH_DEFAULT_TYPEMAP_HASH_SIZE), mByName(ETCH_DEFAULT_TYPEMAP_HASH_SIZE), mLocked(false)
{
}
EtchTypeMap::~EtchTypeMap() {
@@ -28,7 +30,9 @@ EtchTypeMap::~EtchTypeMap() {
while (it.hasNext()) {
capu::Pair<capu::int32_t, EtchType*> pair;
it.next(&pair);
- delete pair.second;
+ if (pair.second != NULL) {
+ delete pair.second;
+ }
}
mById.clear();
mByName.clear();
@@ -102,4 +106,4 @@ void EtchTypeMap::clear() {
}
mByName.clear();
mById.clear();
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
Wed Oct 17 06:50:36 2012
@@ -27,7 +27,7 @@ public:
* Validator cache
*/
struct ValidatorCache {
- ValidatorCache() : id(0), validators(100) {}
+ ValidatorCache() : id(0), validators(ETCH_DEFAULT_CUSTOMVALIDATORCACHE_HASH_SIZE) {}
capu::uint64_t id;
EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >
validators;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
Wed Oct 17 06:50:36 2012
@@ -30,7 +30,7 @@ const EtchString& EtchDefaultDeliverySer
}
EtchDefaultDeliveryService::EtchDefaultDeliveryService(EtchRuntime* runtime, EtchMailboxManager*
transport, const EtchString& uri)
-: mTransport(transport), mStatus(EtchString("session status"), EtchString("")) {
+: mRuntime(runtime), mTransport(transport), mStatus(EtchString("session status"), EtchString(""))
{
EtchURL url(uri);
init(&url);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
Wed Oct 17 06:50:36 2012
@@ -20,7 +20,7 @@
#include "capu/os/Debug.h"
EtchPlainMailboxManager::EtchPlainMailboxManager(EtchRuntime* runtime, EtchTransportMessage*
transport, const EtchString& uri, EtchResources* resources)
-: mRuntime(runtime), mSession(NULL), mTransport(transport), mUp(false) {
+: mRuntime(runtime), mSession(NULL), mTransport(transport), mUp(false), mMailboxes(ETCH_DEFAULT_MAILBOXMANAGER_HASH_SIZE)
{
capu::Debug::Assert(mRuntime != NULL);
mTransport->setSession(this);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp Wed Oct 17 06:50:36
2012
@@ -19,7 +19,7 @@
#include "util/EtchResources.h"
EtchResources::EtchResources()
-: mRelated(NULL) {
+: mRelated(NULL), mRes(ETCH_DEFAULT_RESOURCES_HASH_SIZE) {
}
@@ -32,7 +32,7 @@ EtchResources::~EtchResources() {
capu::bool_t EtchResources::containsKey(const EtchString& key) {
EtchObject* ptr = NULL;
- if (res.get(key, &ptr) == ETCH_OK)
+ if (mRes.get(key, &ptr) == ETCH_OK)
return true;
else {
if (mRelated == NULL)
@@ -46,7 +46,7 @@ capu::bool_t EtchResources::containsKey(
}
status_t EtchResources::get(const EtchString& key, EtchObject*& result) {
- if (res.get(key, &result) != ETCH_OK) {
+ if (mRes.get(key, &result) != ETCH_OK) {
if (mRelated == NULL)
return ETCH_ENOT_EXIST;
@@ -58,12 +58,12 @@ status_t EtchResources::get(const EtchSt
}
status_t EtchResources::put(const EtchString& key, EtchObject* value, EtchObject*&
result) {
- return res.put(key, value, &result);
+ return mRes.put(key, value, &result);
}
status_t EtchResources::remove(const EtchString& key, EtchObject*& result) {
- return res.remove(key, &result);
+ return mRes.remove(key, &result);
}
EtchResources* EtchResources::getRelated() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp?rev=1399116&r1=1399115&r2=1399116&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp Wed Oct 17 06:50:36
2012
@@ -18,7 +18,8 @@
#include "util/EtchURL.h"
#include "capu/os/StringUtils.h"
-EtchURL::EtchURL() {
+EtchURL::EtchURL()
+ : terms(ETCH_DEFAULT_URL_TERMS_HASH_SIZE) {
}
@@ -418,4 +419,4 @@ EtchList<EtchString>& EtchURL::getParams
EtchHashTable<EtchString, EtchString>& EtchURL::getTerms() {
return terms;
-}
\ No newline at end of file
+}
Author: veithm
Date: Wed Oct 17 06:50:24 2012
New Revision: 1399115
URL: http://svn.apache.org/viewvc?rev=1399115&view=rev
Log:
ETCH-244 Adding runtime and logging to code generation templates
- added Logging
- refactored runtime usage
Change-Id: I3b9e3b6faf76ca0b1089fa509933b68afebe2482
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchImportExportHelper.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
Wed Oct 17 06:50:24 2012
@@ -1302,7 +1302,7 @@ public class Compiler extends Backend {
if (n.efqname(this).equals("EtchHashTable")) return b.className()+"<EtchObjectPtr,
EtchObjectPtr> ";
if (n.efqname(this).equals("EtchHashSet")) return b.className()+"<EtchObjectPtr>
";
throw new IllegalArgumentException(String.format(
- "unable to find correct Etch data type for type at line %d: %s", t.beginLine,
n.efqname(this)));
+ "unable to find correct Etch data type for type at line %d: %s", t.beginLine,
n.efqname(this)));
}
if (n.isEnumx()) {
return n.efqname(this);
@@ -1492,7 +1492,7 @@ public class Compiler extends Backend {
TypeRef type = param.type();
if (type.isBuiltin())
- return String.format("EtchValidator%s::Get(%d, tmpValue)",
+ return String.format("EtchValidator%s::Get(runtime, %d, tmpValue)",
this.getValidatorStringForParam(param), type.dim());
Named<?> n = type.getNamed(type.intf());
@@ -1513,7 +1513,7 @@ public class Compiler extends Backend {
* int i = cn.indexOf( '<' ); if (i >= 0) cn = cn.substring( 0, i );
*/
return String.format(
- "EtchValidatorCustom::Get(%d, %s::TYPE(), %s, tmpValue);",
+ "EtchValidatorCustom::Get(runtime, %d, %s::TYPE(), %s, tmpValue);",
type.dim(), cn, b.allowSubclass());
}
@@ -1523,13 +1523,13 @@ public class Compiler extends Backend {
if (n.isStruct()) {
Struct s = (Struct) n;
return String.format(
- "EtchValidatorCustom::Get( %d, %s::TYPE(), true, tmpValue);",
+ "EtchValidatorCustom::Get(runtime, %d, %s::TYPE(), true, tmpValue);",
type.dim(), s
.service().name() + "::" + n.efqname(this));
}
Except e = (Except) n;
return String.format(
- "EtchValidatorCustom::Get( %d, %s::TYPE(), true, tmpValue);", type.dim(), e
+ "EtchValidatorCustom::Get(runtime, %d, %s::TYPE(), true, tmpValue);", type.dim(),
e
.service().name() + "::" + n.efqname(this));
}
// Don't allow subclassing for externs or etch defined enums.
@@ -1538,7 +1538,7 @@ public class Compiler extends Backend {
"n.isExtern() || n.isEnumx(): " + n);
Enumx e = (Enumx) n;
return String.format(
- "EtchValidatorCustom::Get( %d, %s::TYPE(), false, tmpValue);",
+ "EtchValidatorCustom::Get(runtime, %d, %s::TYPE(), false, tmpValue);",
type.dim(), n.efqname(this));
}
@@ -1548,11 +1548,11 @@ public class Compiler extends Backend {
String efgName = this.getExcept(thrown).service().name() + "::"
+ e.efqname(this);
return String.format(
- "EtchValidatorCustom::Get(0, %s::TYPE(), true, tmpValue);"
+ "EtchValidatorCustom::Get(runtime, 0, %s::TYPE(), true, tmpValue);"
, efgName);
}
if (named instanceof Item)
- return "EtchValidatorBoolean::Get(0, tmpValue)";
+ return "EtchValidatorBoolean::Get(runtime, 0, tmpValue)";
return "NULL";
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
Wed Oct 17 06:50:24 2012
@@ -67,9 +67,9 @@ status_t $clname::Listener${i}Server::ne
EtchValueFactory* vf = (EtchValueFactory*) obj;
//create stack layers
- EtchMailboxManager* mbm = new EtchPlainMailboxManager(transport, uri, resources);
+ EtchMailboxManager* mbm = new EtchPlainMailboxManager(runtime, transport, uri, resources);
stack->setMailboxManager(mbm);
- EtchDeliveryService* dvs = new EtchDefaultDeliveryService(mbm, uri);
+ EtchDeliveryService* dvs = new EtchDefaultDeliveryService(runtime, mbm, uri);
stack->setDeliveryService(dvs);
Remote${i}Client* client = new Remote${i}Client(runtime, dvs, vf, stack);
stack->setRemote(client);
@@ -126,7 +126,7 @@ status_t $clname::newListener(EtchRuntim
//init resources
EtchResources *res;
- status = EtchTransportHelper::InitResources(resources, res);
+ status = EtchTransportHelper::InitResources(runtime, resources, res);
if (status != ETCH_OK) {
return status;
}
@@ -164,14 +164,14 @@ status_t $clname::newListener(EtchRuntim
{
status_t status = ETCH_OK;
- EtchStackClient* stack = new EtchStackClient();
+ EtchStackClient* stack = new EtchStackClient(runtime);
//static initialization of value factory
ValueFactory${i}::InitValueFactory(runtime);
//init resources
EtchResources* res;
- status = InitResources(resources, res);
+ status = InitResources(runtime, resources, res);
if (status != ETCH_OK) {
return status;
}
@@ -191,9 +191,9 @@ status_t $clname::newListener(EtchRuntim
//init stack layers
EtchTransportMessage* m;
EtchTransportFactory::getTransport(runtime, uri, res, m);
- EtchMailboxManager* mbm = new EtchPlainMailboxManager(m, uri, res);
+ EtchMailboxManager* mbm = new EtchPlainMailboxManager(runtime, m, uri, res);
stack->setMailboxManager(mbm);
- EtchDeliveryService* dvs = new EtchDefaultDeliveryService(mbm, uri);
+ EtchDeliveryService* dvs = new EtchDefaultDeliveryService(runtime, mbm, uri);
stack->setDeliveryService(dvs);
Remote${i}Server* _server = new Remote${i}Server(runtime, dvs, vf, stack);
${i}Client* client = implFactory.new${i}Client( server );
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
Wed Oct 17 06:50:24 2012
@@ -119,7 +119,7 @@ $clname::$clname(EtchRuntime* runtime, E
: Remote${i}(runtime, svc, vf, stack) {
#else
$clname::$clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack*
stack )
- : EtchRemoteBase(svc, vf, stack), mRuntime(runtime) {
+ : EtchRemoteBase(runtime, svc, vf, stack), mRuntime(runtime) {
#end
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
Wed Oct 17 06:50:24 2012
@@ -38,6 +38,7 @@
#end
\#include "ValueFactory${i}.h"
\#include "support/EtchStubHelper.h"
+\#include "support/EtchRuntime.h"
using namespace $namespace;
@@ -49,15 +50,22 @@ class Run${mthd.vname($helper)}
: public EtchStubHelper<$i$suffix>
{
public:
+ Run${mthd.vname($helper)}(EtchRuntime* runtime)
+ : EtchStubHelper(runtime) {
+ }
+
+ ~Run${mthd.vname($helper)}() {
+ }
+
status_t run(EtchStubBase<$i$suffix>* _ref, EtchDeliveryService *_svc, $i$suffix
*_obj, capu::SmartPointer<EtchWho> _sender, capu::SmartPointer<EtchMessage> _msg
)
{
status_t status = ETCH_OK;
-
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Called ${mthd.vname($helper)}
Run-Method.");
#if (!$mthd.isOneway())
capu::SmartPointer<EtchMessage> _rmsg;
status = _msg->createReplyMessage(_rmsg);
if(status != ETCH_OK) {
- // TODO log error
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Coudn't create
reply-message.");
// TODO set exception
return ETCH_ERROR;
}
@@ -75,15 +83,18 @@ public:
$intfname::$mthd.name()AsyncResultPtr ar;
#set($sep = "")
#set($count = 0)
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Calling implementation
of \"$mthd.name()\" function.");
ar = _obj->$mthd.name()(#foreach($param in $mthd.iterator())#if($mthd.hasAuth())${sep}$param.name()#else#set($count
= $count + 1)${sep}val$count#end#set($sep = ", ")#end);
// create result message
#if($mthd.hasReturn())
if(ar->hasResult()) {
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name()
- returned an Result, generating Answer Message.");
_rmsg->put(ValueFactory$i::_mf_result(), ar->getResult());
} else
#end
if(ar->hasException()) {
+ CAPU_LOG_DEBUG(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name()
- returned an Exception - notify Session.");
_ref->sessionNotify(ar->getException());
#if ($mthd.isOneway())
EtchMessagePtr _rmsg;
@@ -92,12 +103,14 @@ public:
_rmsg->put( ValueFactory$i::_mf_result(), ar->getException() );
#if ($mthd.isOneway())
// transport result message
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name()
- (One-Way) Transport Message back! Because an Exception occurred!.");
status = _svc->transportMessage( _sender, _rmsg);
#end
}
#if (!$mthd.isOneway())
// transport result message
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name()
- Transport answer-message back!.");
status = _svc->transportMessage( _sender, _rmsg);
#end
return status;
@@ -153,23 +166,22 @@ namespace $namespace {
/**
* Static Initialization-Helper
*/
- static status_t Init()
+ static status_t Init(EtchRuntime* runtime)
{
- #foreach( $mthd in $intf.iterator() )
- #if ($mthd.isMsgDir($mc))
- #if (!$mthd.isHidden())
- ValueFactory$i::${mthd.vname( $helper )}->setStubHelper(new Run${mthd.vname($helper)}());
- #end
- #end
- #if( $n.isMixin() )
- #set( $m = $n.getModule() )
- #set( $z = $m.iterator().next() )
- ${m.name()}::Stub${z.name()}${suffix}::Init();
- #end
- #end
+#foreach( $mthd in $intf.iterator() )
+#if ($mthd.isMsgDir($mc))
+#if (!$mthd.isHidden())
+ ValueFactory$i::${mthd.vname( $helper )}->setStubHelper(new Run${mthd.vname($helper)}(runtime));
+#end
+#end
+#if( $n.isMixin() )
+#set( $m = $n.getModule() )
+#set( $z = $m.iterator().next() )
+ ${m.name()}::Stub${z.name()}${suffix}::Init(runtime);
+#end
+#end
return ETCH_OK;
}
-
##end
};
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
Wed Oct 17 06:50:24 2012
@@ -34,6 +34,7 @@
\#include "serialization/EtchAsyncMode.h"
\#include "serialization/EtchDirection.h"
\#include "serialization/EtchValidators.h"
+\#include "serialization/EtchImportExportHelper.h"
using namespace $namespace;
@@ -62,6 +63,13 @@ $vf::Etch${intf.name()}RuntimeListener $
class ImportExportHelper$n.vname($helper)
: public EtchImportExportHelper {
public:
+ ImportExportHelper$n.vname($helper)(EtchRuntime* runtime)
+ : EtchImportExportHelper(runtime) {
+ }
+
+ virtual ~ImportExportHelper$n.vname($helper)() {
+ }
+
status_t exportValue(EtchValueFactory* vf, EtchObjectPtr value, EtchStructValue *&result)
{
EtchStructValue* _struct = new EtchStructValue( $vf::${n.vname( $helper )}, vf );
@@ -73,6 +81,7 @@ public:
_struct->put($vf::$p.vname($helper)(), val$CountParams );
#end
result = _struct;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "$vf", "${namespace}: exported $n.vname($helper)
Value.");
return ETCH_OK;
}
status_t importValue(EtchStructValue* value, EtchObjectPtr &result)
@@ -88,6 +97,7 @@ public:
v->$helper.getSetterName($p.name())(tmp$CountParams);
#end
result = v;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "$vf", "${namespace}: imported $n.vname($helper)
Value.");
return ETCH_OK;
}
};
@@ -224,7 +234,7 @@ status_t ${vf}::InitResults()
}
## ----------------------------- import / export -----------------------------
-status_t ${vf}::InitImportExport()
+status_t ${vf}::InitImportExport(EtchRuntime* runtime)
{
#foreach ( $n in $intf.iterator() )
#if ($n.isStruct() || $n.isExcept())
@@ -234,14 +244,14 @@ status_t ${vf}::InitImportExport()
#if ($n.hasExtends())
$vf::${n.vname($helper)}->setSuperType($n.getExtends().vname($helper));
#end
- $vf::${n.vname($helper)}->setImportExportHelper(new ImportExportHelper$n.vname($helper)());
+ $vf::${n.vname($helper)}->setImportExportHelper(new ImportExportHelper$n.vname($helper)(runtime));
#elseif ($n.isExtern())
#set( $tname = $n.efqname( $helper ) )
#elseif ($n.isEnumx())
#set( $tname = $n.efqname( $helper ) )
$vf::class2type()->put(${tname}::TYPE(), $vf::${n.vname($helper)});
$vf::${n.vname( $helper )}->setComponentType(${tname}::TYPE());
- $vf::${n.vname( $helper )}->setImportExportHelper(new ImportExportHelper$n.vname($helper)());
+ $vf::${n.vname( $helper )}->setImportExportHelper(new ImportExportHelper$n.vname($helper)(runtime));
#end
#end
@@ -271,7 +281,7 @@ status_t ${vf}::InitFields()
#set( $ctr = 0 )
-status_t $vf::InitParams()
+status_t $vf::InitParams(EtchRuntime* runtime)
{
capu::SmartPointer<EtchValidator> tmpValue;
#foreach( $n in $intf.iterator() )
@@ -293,7 +303,7 @@ status_t $vf::InitParams()
#end ## -- foreach --
#end ## -- else --
#if ($n.isMessage())
- EtchValidatorLong::Get(0, tmpValue);
+ EtchValidatorLong::Get(runtime, 0, tmpValue);
${n.vname( $helper )}->putValidator($vf::_mf__messageId(), tmpValue);
#if ($n.isHidden())
@@ -304,9 +314,9 @@ status_t $vf::InitParams()
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue); //
thrown $t.name()
#end ## -- foreach --
- EtchValidatorRuntimeException::Get(tmpValue);
+ EtchValidatorRuntimeException::Get(runtime, tmpValue);
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue); //
thrown RuntimeException
- EtchValidatorLong::Get(0, tmpValue);
+ EtchValidatorLong::Get(runtime, 0, tmpValue);
$vf::${n.vname( $helper )}->putValidator($vf::_mf__inReplyTo(), tmpValue);
#end ## -- isHidden --
#end ## -- isMessage --
@@ -338,7 +348,7 @@ status_t $vf::InitValueFactory(EtchRunti
}
SRuntimesMutex.unlock();
- status = $vf::Init( types(), class2type() );
+ status = $vf::Init(runtime, types(), class2type());
if (status != ETCH_OK) {
return status;
}
@@ -359,33 +369,33 @@ status_t $vf::InitValueFactory(EtchRunti
}
#foreach( $n in $intf.iterator() )
#if ($n.isExtern())
- status = ${n.sname( $helper )}.Init( ${n.vname($helper)}(), class2type );
+ status = ${n.sname( $helper )}.Init(runtime, ${n.vname($helper)}(), class2type);
if (status != ETCH_OK) {
return status;
}
#end
#end
- status = $vf::InitParams();
+ status = $vf::InitParams(runtime);
if (status != ETCH_OK) {
return status;
}
- status = $vf::InitImportExport();
+ status = $vf::InitImportExport(runtime);
if (status != ETCH_OK) {
return status;
}
- status = Stub${i}<void>::Init();
+ status = Stub${i}<void>::Init(runtime);
if (status != ETCH_OK) {
return status;
}
- status = Stub${i}Server::Init();
+ status = Stub${i}Server::Init(runtime);
if (status != ETCH_OK) {
return status;
}
- status = Stub${i}Client::Init();
+ status = Stub${i}Client::Init(runtime);
if (status != ETCH_OK) {
return status;
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
Wed Oct 17 06:50:24 2012
@@ -79,7 +79,7 @@ namespace $namespace {
static status_t InitTypes();
static status_t InitResults();
static status_t InitFields();
- static status_t InitParams();
+ static status_t InitParams(EtchRuntime* runtime);
#set( $ctr = 0 )
#foreach( $n in $intf.iterator() )
#if ($n.isEnumx() || $n.isStruct() || $n.isExcept() || $n.isMessage())
@@ -89,7 +89,7 @@ namespace $namespace {
#set( $ctr = $ctr + 1 )
#end
#end
- static status_t InitImportExport();
+ static status_t InitImportExport(EtchRuntime* runtime);
/**
* Static Initialization-Helper
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
Wed Oct 17 06:50:24 2012
@@ -56,7 +56,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h Wed
Oct 17 06:50:24 2012
@@ -61,7 +61,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
Wed Oct 17 06:50:24 2012
@@ -62,7 +62,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchImportExportHelper.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchImportExportHelper.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchImportExportHelper.h
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchImportExportHelper.h
Wed Oct 17 06:50:24 2012
@@ -19,6 +19,7 @@
#ifndef __ETCHIMPORTEXPORTHELPER_H__
#define __ETCHIMPORTEXPORTHELPER_H__
#include "serialization/EtchValueFactory.h"
+#include "support/EtchRuntime.h"
class EtchStructValue;
@@ -30,6 +31,12 @@ class EtchImportExportHelper {
public:
/**
+ * Constructor
+ */
+ EtchImportExportHelper(EtchRuntime* runtime) : mRuntime(runtime) {
+ }
+
+ /**
* Destructor
*/
virtual ~EtchImportExportHelper() {
@@ -56,6 +63,8 @@ public:
*/
virtual status_t importValue(EtchStructValue* value, capu::SmartPointer<EtchObject>
&result) = 0;
+protected:
+ EtchRuntime* mRuntime;
};
#endif /* ETCHIMPORTEXPORTHELPER_H */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h Wed
Oct 17 06:50:24 2012
@@ -61,7 +61,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
Wed Oct 17 06:50:24 2012
@@ -62,7 +62,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h Wed
Oct 17 06:50:24 2012
@@ -56,7 +56,6 @@ public:
static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
- EtchRuntime* mRuntime;
EtchField mField;
EtchType* mType;
const static EtchString& FIELD_NAME();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h Wed Oct 17 06:50:24
2012
@@ -75,8 +75,8 @@ protected:
* The message source.
*/
EtchDeliveryService* mSvc;
- EtchFreePool* mFreePool;
EtchQueuedPool* mQueuedPool;
+ EtchFreePool* mFreePool;
/**
* The object used to implement stub.
@@ -126,7 +126,7 @@ private:
template<typename T>
EtchStubBase<T>::EtchStubBase(EtchDeliveryService* svc, T* obj, EtchQueuedPool* queued,
EtchFreePool* free)
-: mSvc(svc), mObj(obj), mQueuedPool(queued), mFreePool(free) {
+: mSvc(svc), mQueuedPool(queued), mFreePool(free), mObj(obj) {
mSvc->setSession(this);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h Wed Oct 17 06:50:24
2012
@@ -22,6 +22,7 @@
#include "capu/util/SmartPointer.h"
#include "support/EtchDeliveryService.h"
+#include "support/EtchRuntime.h"
template<typename T>
class EtchStubBase;
@@ -44,13 +45,13 @@ public:
* Constructs a StubHelper which uses synchronous mode to dispatch
* method from message.
*/
- EtchStubHelper() {
+ EtchStubHelper(EtchRuntime* runtime)
+ : mRuntime(runtime) {
addObjectType(TYPE());
- // nothing to do.
}
EtchStubHelper(const EtchStubHelper& other)
- : EtchObject(other) {
+ : EtchObject(other), mRuntime(other.mRuntime) {
}
/**
@@ -61,6 +62,11 @@ public:
* @param msg
*/
virtual status_t run(EtchStubBase<T>* ref, EtchDeliveryService* svc, T* obj, capu::SmartPointer<EtchWho>
sender, capu::SmartPointer<EtchMessage> msg ) = 0;
+
+
+protected:
+ EtchRuntime* mRuntime;
+
};
template<typename T>
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -27,7 +27,7 @@ const EtchString& EtchAuthenticationExce
}
EtchAuthenticationExceptionSerializer::EtchAuthenticationExceptionSerializer(EtchRuntime*
runtime, EtchType* type, EtchField* field)
-: mRuntime(runtime), mField(*field), mType(type) {
+: EtchImportExportHelper(runtime), mField(*field), mType(type) {
}
EtchAuthenticationExceptionSerializer::~EtchAuthenticationExceptionSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -27,7 +27,7 @@ const EtchString& EtchDateSerializer::FI
}
EtchDateSerializer::EtchDateSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
-: mRuntime(runtime), mField(*field), mType(type) {
+: EtchImportExportHelper(runtime), mField(*field), mType(type) {
}
EtchDateSerializer::~EtchDateSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -28,7 +28,7 @@ const EtchString& EtchHashTableSerialize
}
EtchHashTableSerializer::EtchHashTableSerializer(EtchRuntime* runtime, EtchType* type, EtchField&
field)
-: mRuntime(runtime), mField(field), mType(type) {
+: EtchImportExportHelper(runtime), mField(field), mType(type) {
}
EtchHashTableSerializer::~EtchHashTableSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -29,7 +29,7 @@ const EtchString& EtchListSerializer::FI
// TODO: check signature regarding by value copy
EtchListSerializer::EtchListSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
-: mRuntime(runtime), mField(*field), mType(type) {
+: EtchImportExportHelper(runtime), mField(*field), mType(type) {
}
EtchListSerializer::~EtchListSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -29,7 +29,7 @@ const EtchString& EtchRuntimeExceptionSe
// TODO: check signature regarding by value copy
EtchRuntimeExceptionSerializer::EtchRuntimeExceptionSerializer(EtchRuntime* runtime, EtchType*
type, EtchField* field)
-: mRuntime(runtime), mField(*field), mType(type) {
+: EtchImportExportHelper(runtime), mField(*field), mType(type) {
}
EtchRuntimeExceptionSerializer::~EtchRuntimeExceptionSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
Wed Oct 17 06:50:24 2012
@@ -27,7 +27,7 @@ const EtchString& EtchSetSerializer::FIE
}
EtchSetSerializer::EtchSetSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
-: mRuntime(runtime), mField(*field), mType(type) {
+: EtchImportExportHelper(runtime), mField(*field), mType(type) {
}
EtchSetSerializer::~EtchSetSerializer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1399115&r1=1399114&r2=1399115&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
Wed Oct 17 06:50:24 2012
@@ -27,6 +27,7 @@ public:
* Validator cache
*/
struct ValidatorCache {
+ ValidatorCache() : id(0), validators(100) {}
capu::uint64_t id;
EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >
validators;
};
Modified: incubator/etch/trunk/examples/helloworld/java/.classpath
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/java/.classpath?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/java/.classpath (original)
+++ incubator/etch/trunk/examples/helloworld/java/.classpath Wed Oct 17 06:50:01 2012
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="target/generated-sources/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="ETCH_HOME/binding-java/lib/apache-etch-java-runtime-1.3.0-incubating.jar"/>
+ <classpathentry kind="var" path="ETCH_HOME/binding-java/lib/apache-etch-java-runtime-1.3.0-incubating.jar"
sourcepath="/ETCH_HOME_SRC"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: incubator/etch/trunk/examples/helloworld/java/src/main/org/apache/etch/examples/helloworld/ImplHelloWorldServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/java/src/main/org/apache/etch/examples/helloworld/ImplHelloWorldServer.java?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/java/src/main/org/apache/etch/examples/helloworld/ImplHelloWorldServer.java
(original)
+++ incubator/etch/trunk/examples/helloworld/java/src/main/org/apache/etch/examples/helloworld/ImplHelloWorldServer.java
Wed Oct 17 06:50:01 2012
@@ -54,6 +54,12 @@ public class ImplHelloWorldServer extend
@Override
public String say_hello(user u){
+ try {
+ Thread.sleep(1000000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
return "Hello " + u.name;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchTypeTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -59,11 +54,11 @@ TEST_F(EtchTypeTest, putValidatorTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v1;
- EtchValidatorInt::Get(0, v1);
+ EtchValidatorInt::Get(mRuntime, 0, v1);
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorLong::Get(0, v2);
+ EtchValidatorLong::Get(mRuntime, 0, v2);
capu::SmartPointer<EtchValidator> v3;
- EtchValidatorByte::Get(0, v3);
+ EtchValidatorByte::Get(mRuntime, 0, v3);
EXPECT_EQ(t.putValidator(f, v1), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v2), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v3), ETCH_OK); //makes a combo generator
@@ -79,7 +74,7 @@ TEST_F(EtchTypeTest, getValidatorTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v;
- EtchValidatorInt::Get(0, v);
+ EtchValidatorInt::Get(mRuntime, 0, v);
capu::SmartPointer<EtchValidator> result = NULL;
t.putValidator(f, v);
EXPECT_EQ(t.getValidator(f, result), ETCH_OK);
@@ -95,9 +90,9 @@ TEST_F(EtchTypeTest, clearTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v1;
- EtchValidatorInt::Get(0, v1);
+ EtchValidatorInt::Get(mRuntime, 0, v1);
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorLong::Get(0, v2);
+ EtchValidatorLong::Get(mRuntime, 0, v2);
EXPECT_EQ(t.putValidator(f, v1), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v2), ETCH_OK);
EXPECT_EQ(t.clearValidator(f), ETCH_OK);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorBooleanTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,7 +42,7 @@ protected:
TEST_F(EtchValidatorBooleanTest, createTest) {
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val.get() != NULL);
@@ -57,7 +52,7 @@ TEST_F(EtchValidatorBooleanTest, createT
EtchObjectType type1(EOTID_BOOL, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorBoolean::Get(2, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 2, val2) == ETCH_OK);
val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val.get() != NULL);
EXPECT_TRUE(val->getExpectedType()->equals(&type2));
@@ -70,7 +65,7 @@ TEST_F(EtchValidatorBooleanTest, validat
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_FALSE(val->validate(boolean));
EXPECT_FALSE(val->validate(integer));
@@ -84,7 +79,7 @@ TEST_F(EtchValidatorBooleanTest, validat
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val->validateValue(boolean, result) == ETCH_ERROR);
EXPECT_TRUE(val->validateValue(integer, result) == ETCH_ERROR);
@@ -93,7 +88,7 @@ TEST_F(EtchValidatorBooleanTest, validat
TEST_F(EtchValidatorBooleanTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(1, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 1, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
capu::SmartPointer<EtchValidator> element_validator;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorByteTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,14 +43,14 @@ TEST_F(EtchValidatorByteTest, createTest
capu::SmartPointer<EtchValidatorByte> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorByte::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorByte>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchByte::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_BYTE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorByte::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorByte>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -82,7 +77,7 @@ TEST_F(EtchValidatorByteTest, validateTe
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_TRUE(ptr->validate(integer));
@@ -110,11 +105,11 @@ TEST_F(EtchValidatorByteTest, validateVa
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchByte*) result.get())->get() == ((EtchInt32*) integer.get())->get());
-
+
EXPECT_TRUE(ptr->validateValue(integer2, result) == ETCH_OK);
EXPECT_TRUE(((EtchByte*) result.get())->get() == ((EtchInt32*) integer2.get())->get());
@@ -128,7 +123,7 @@ TEST_F(EtchValidatorByteTest, validateVa
TEST_F(EtchValidatorByteTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp Wed Oct 17 06:50:01 2012
@@ -49,16 +49,11 @@ class EtchValidatorCustomTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -71,7 +66,7 @@ TEST_F(EtchValidatorCustomTest, createTe
status_t status;
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
ptr = (EtchValidatorCustom*)val.get();
@@ -81,7 +76,7 @@ TEST_F(EtchValidatorCustomTest, createTe
EtchObjectType type1(99, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- status = EtchValidatorCustom::Get(2, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 2, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
ptr = (EtchValidatorCustom*) val.get();
@@ -115,7 +110,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
EXPECT_FALSE(val->validate(byte));
@@ -149,7 +144,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
EXPECT_TRUE(val->validateValue(byte, result) == ETCH_ERROR);
@@ -166,7 +161,7 @@ TEST_F(EtchValidatorCustomTest, elementV
status_t status;
capu::SmartPointer<EtchValidator> ptr = NULL;
- status = EtchValidatorCustom::Get(1, MockGeneratedClass::TYPE(), true, ptr);
+ status = EtchValidatorCustom::Get(mRuntime, 1, MockGeneratedClass::TYPE(), true, ptr);
EXPECT_EQ(ETCH_OK, status);
capu::SmartPointer<EtchValidator> element_validator;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorDoubleTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorDoubleTest, createTe
capu::SmartPointer<EtchValidatorDouble> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorDouble>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchDouble::TYPE()));
@@ -57,7 +52,7 @@ TEST_F(EtchValidatorDoubleTest, createTe
EtchObjectType type1(EOTID_DOUBLE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorDouble::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorDouble>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -76,7 +71,7 @@ TEST_F(EtchValidatorDoubleTest, validate
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
@@ -96,7 +91,7 @@ TEST_F(EtchValidatorDoubleTest, validate
capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(5.13);
capu::SmartPointer<EtchObject> doubleTmp3 = new EtchDouble(127.54);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(doubleTmp, result) == ETCH_OK);
EXPECT_TRUE(((EtchDouble*) result.get())->get() == ((EtchDouble*) doubleTmp.get())->get());
@@ -108,7 +103,7 @@ TEST_F(EtchValidatorDoubleTest, validate
TEST_F(EtchValidatorDoubleTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorFloatTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -49,7 +44,7 @@ TEST_F(EtchValidatorFloatTest, createTes
capu::SmartPointer<EtchValidatorFloat> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorFloat>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchFloat::TYPE()));
@@ -58,7 +53,7 @@ TEST_F(EtchValidatorFloatTest, createTes
EtchObjectType type1(EOTID_FLOAT, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorFloat::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorFloat>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -76,7 +71,7 @@ TEST_F(EtchValidatorFloatTest, validateT
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
@@ -95,7 +90,7 @@ TEST_F(EtchValidatorFloatTest, validateV
capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(static_cast<capu::float_t>(5.13));
capu::SmartPointer<EtchObject> floatTmp3 = new EtchFloat(static_cast<capu::float_t>(127.54));
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(floatTmp, result) == ETCH_OK);
EXPECT_TRUE(((EtchFloat*) result.get())->get() == ((EtchFloat*) floatTmp.get())->get());
@@ -107,7 +102,7 @@ TEST_F(EtchValidatorFloatTest, validateV
TEST_F(EtchValidatorFloatTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorIntTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,14 +42,14 @@ protected:
TEST_F(EtchValidatorIntTest, createTest) {
capu::SmartPointer<EtchValidatorInt> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorInt::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorInt>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchInt32::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_INT32, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorInt::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorInt>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -90,7 +85,7 @@ TEST_F(EtchValidatorIntTest, validateTes
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -121,7 +116,7 @@ TEST_F(EtchValidatorIntTest, validateVal
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchInt32*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -138,7 +133,7 @@ TEST_F(EtchValidatorIntTest, validateVal
TEST_F(EtchValidatorIntTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorLongTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorLongTest, createTest
capu::SmartPointer<EtchValidatorLong> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorLong::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorLong>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchLong::TYPE()));
@@ -56,7 +51,7 @@ TEST_F(EtchValidatorLongTest, createTest
EtchObjectType type1(EOTID_LONG, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorLong::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorLong>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -91,7 +86,7 @@ TEST_F(EtchValidatorLongTest, validateTe
capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -122,7 +117,7 @@ TEST_F(EtchValidatorLongTest, validateVa
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -136,7 +131,7 @@ TEST_F(EtchValidatorLongTest, validateVa
TEST_F(EtchValidatorLongTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp Wed Oct 17 06:50:01 2012
@@ -35,16 +35,11 @@ class EtchValidatorObjectTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -55,11 +50,11 @@ protected:
TEST_F(EtchValidatorObjectTest, createTest) {
capu::SmartPointer<EtchValidatorObject> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorObject::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorObject>(val);
EXPECT_TRUE(ptr->getNDims() == 0);
- EXPECT_TRUE(EtchValidatorObject::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorObject>(val);
EXPECT_TRUE(ptr->getNDims() == 2);
}
@@ -69,7 +64,7 @@ TEST_F(EtchValidatorObjectTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(boolean));
EXPECT_TRUE(ptr->validate(integer));
@@ -108,7 +103,7 @@ TEST_F(EtchValidatorObjectTest, validate
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(str, result) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(longInteger5, result) == ETCH_OK);
@@ -133,7 +128,7 @@ TEST_F(EtchValidatorObjectTest, validate
TEST_F(EtchValidatorObjectTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorRuntimeExceptionTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ protected:
TEST_F(EtchValidatorRuntimeExceptionTest, createTest) {
capu::SmartPointer<EtchValidatorRuntimeException> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorRuntimeException>(val);
}
@@ -58,7 +53,7 @@ TEST_F(EtchValidatorRuntimeExceptionTest
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, ptr) == ETCH_OK);
EXPECT_FALSE(ptr->validate(boolean));
EXPECT_FALSE(ptr->validate(integer));
EXPECT_TRUE(ptr->validate(exc));
@@ -73,7 +68,7 @@ TEST_F(EtchValidatorRuntimeExceptionTest
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(boolean, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(exc, result) == ETCH_OK);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorShortTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,14 +42,14 @@ protected:
TEST_F(EtchValidatorShortTest, createTest) {
capu::SmartPointer<EtchValidatorShort> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorShort::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorShort>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchShort::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_SHORT, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorShort::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorShort>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -91,7 +86,7 @@ TEST_F(EtchValidatorShortTest, validateT
capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -123,7 +118,7 @@ TEST_F(EtchValidatorShortTest, validateV
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -137,7 +132,7 @@ TEST_F(EtchValidatorShortTest, validateV
TEST_F(EtchValidatorShortTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorStringTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorStringTest, createTe
capu::SmartPointer<EtchValidatorString> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorString::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorString>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchString::TYPE()));
@@ -56,7 +51,7 @@ TEST_F(EtchValidatorStringTest, createTe
EtchObjectType type1(EOTID_STRING, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorString::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorString>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -68,7 +63,7 @@ TEST_F(EtchValidatorStringTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(((EtchTypeValidator*) ptr.get())->getNDims() == 0);
EXPECT_FALSE(ptr->validate(str));
EXPECT_FALSE(ptr->validate(integer));
@@ -81,7 +76,7 @@ TEST_F(EtchValidatorStringTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(str, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(str2, result) == ETCH_OK);
@@ -90,7 +85,7 @@ TEST_F(EtchValidatorStringTest, validate
TEST_F(EtchValidatorStringTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp Wed Oct 17 06:50:01 2012
@@ -79,16 +79,11 @@ class EtchValidatorStructValueTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -102,7 +97,7 @@ TEST_F(EtchValidatorStructValueTest, cre
capu::SmartPointer<EtchValidatorStructValue> ptr = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorStructValue>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchStructValue::TYPE()));
@@ -111,12 +106,12 @@ TEST_F(EtchValidatorStructValueTest, cre
EtchObjectType type1(EOTID_STRUCT_VALUE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorStructValue>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 12, val) == ETCH_EINVAL);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 12, val) == ETCH_EINVAL);
delete type;
}
@@ -129,7 +124,7 @@ TEST_F(EtchValidatorStructValueTest, ele
EtchObjectType type1(EOTID_STRUCT_VALUE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 1, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 1, val) == ETCH_OK);
EXPECT_TRUE(val.get() != NULL);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(val))->getExpectedType()->equals(&type2));
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(val))->getNDims() == 1);
@@ -197,7 +192,7 @@ TEST_F(EtchValidatorStructValueTest, val
capu::SmartPointer<EtchValidator> ptr = NULL;
MockValueFactory8 *fac = new MockValueFactory8();
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, ptr) == ETCH_OK);
capu::SmartPointer<EtchObject> byte = NULL;
@@ -264,7 +259,7 @@ TEST_F(EtchValidatorStructValueTest, val
capu::SmartPointer<EtchValidator> ptr = NULL;
MockValueFactory8 *fac = new MockValueFactory8();
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, ptr) == ETCH_OK);
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getExpectedType()->equals(EtchStructValue::TYPE()));
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getNDims() == 0);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp Wed Oct 17 06:50:01 2012
@@ -83,8 +83,8 @@ public:
*/
public:
- MockDefaultValueFactory2(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory2(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -99,16 +99,12 @@ class EtchRemoteBaseTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
+
delete mRuntime;
mRuntime = NULL;
}
@@ -121,15 +117,15 @@ TEST_F(EtchRemoteBaseTest, constructorTe
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -147,16 +143,16 @@ TEST_F(EtchRemoteBaseTest, newMessageTes
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -187,16 +183,16 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -204,7 +200,7 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
//get the validator
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
//create type
EtchType *mt;
factory->types.get("add", mt);
@@ -232,16 +228,16 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -249,7 +245,7 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
//get the validator
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
//create type
EtchType *mt;
factory->types.get("add", mt);
@@ -282,16 +278,16 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -301,7 +297,7 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EtchType * type;
EtchType * replyType;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -341,7 +337,7 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EXPECT_TRUE(result == data);
factory->types.clear();
-
+
delete transport;
delete mail;
delete remote;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp Wed Oct 17 06:50:01 2012
@@ -19,14 +19,20 @@
#include "gmock/gmock.h"
#include "support/EtchRuntime.h"
+capu::uint64_t currentIdCount;
+
TEST(EtchRuntime, Default) {
- EtchRuntime* runtime = new EtchRuntime();
+ EtchRuntime* runtime = new EtchRuntime(); //ID = 0
+ currentIdCount = runtime->getId();
delete runtime;
}
TEST(EtchRuntime, getId) {
- EtchRuntime* runtime = new EtchRuntime();
- capu::uint64_t id = runtime->getId();
+ EtchRuntime* runtime = new EtchRuntime(); //ID = 1
+ EXPECT_EQ(currentIdCount + 1, runtime->getId());
+ delete runtime;
+ runtime = new EtchRuntime(); //ID = 2
+ EXPECT_EQ(currentIdCount + 2, runtime->getId());
delete runtime;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,7 +28,7 @@
class MockSession1 : public EtchSessionMessage {
public:
- MockSession1(EtchTransportMessage* transport)
+ MockSession1(EtchTransportMessage* transport)
: mTransport(transport) {
if(mTransport != NULL) {
mTransport->setSession(this);
@@ -96,8 +96,8 @@ public:
*/
public:
- MockDefaultValueFactory1(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory1(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -112,16 +112,11 @@ class EtchDefaultDeliveryServiceTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -136,8 +131,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, c
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -151,11 +146,11 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
EtchString uri("tcp://127.0.0.1:4001");
// create value factory
- MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(uri);
+ MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(mRuntime, uri);
//set type and corresponding validator
EtchType * type = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -170,8 +165,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -182,7 +177,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
//test begincall
EtchMailbox *mail = NULL;
EXPECT_TRUE(ETCH_OK == deliveryService->begincall(message, mail));
- EXPECT_EQ(1, mailboxManager->count());
+ EXPECT_EQ(1u, mailboxManager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -203,13 +198,13 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
EtchString uri("tcp://127.0.0.1:4001");
// create value factory
- MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(uri);
+ MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(mRuntime, uri);
//set type and return type and the corresponding validators
EtchType * type = NULL;
EtchType * replyType = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -228,8 +223,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -240,7 +235,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
//performed the call
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == deliveryService->begincall(message, mail));
- EXPECT_EQ(1, mailboxManager->count());
+ EXPECT_EQ(1u, mailboxManager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
EXPECT_TRUE(ETCH_OK == mailboxManager->getMailbox(id, mail));
@@ -264,7 +259,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
status = deliveryService->endcall(mail, replyType, result);
EXPECT_EQ(ETCH_OK, status);
delete mail;
-
+
//check the result
EXPECT_TRUE(result->equals(data.get()));
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp Wed Oct 17 06:50:01 2012
@@ -77,21 +77,15 @@ class EtchMessageTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
-private:
EtchRuntime* mRuntime;
};
@@ -128,9 +122,9 @@ TEST_F(EtchMessageTest, getTypeTest) {
//fill validators
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -154,9 +148,9 @@ TEST_F(EtchMessageTest, isType) {
EtchType* comp = new EtchType(90, "comp");
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
//Create Value Factory
@@ -187,9 +181,9 @@ TEST_F(EtchMessageTest, putTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -226,9 +220,9 @@ TEST_F(EtchMessageTest, getTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -265,7 +259,7 @@ TEST_F(EtchMessageTest, removeTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
comp->putValidator(field1, val1);
EtchMessage *sv = new EtchMessage(comp, factory);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp Wed Oct 17 06:50:01 2012
@@ -30,7 +30,7 @@
class MockListener11 : public virtual EtchSessionListener<EtchSocket> {
public:
- MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
+ MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
: mTransport(transport) {
if(mTransport != NULL) {
mTransport->setSession(this);
@@ -77,60 +77,55 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
-};
-
-class EtchMessagizerTest
- : public ::testing::Test {
-protected:
- virtual void SetUp() {
- mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
- mRuntime->start();
- }
-
- virtual void TearDown() {
- mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
- delete mRuntime;
- mRuntime = NULL;
- }
-
- EtchRuntime* mRuntime;
-};
-
-TEST_F(EtchMessagizerTest, constructorTest) {
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchDefaultValueFactory * factory;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- //created value factory
- EtchURL u("tcp://127.0.0.1:4001");
- EtchResources r;
- EtchObject *out;
+};
+
+class EtchMessagizerTest
+ : public ::testing::Test {
+protected:
+ virtual void SetUp() {
+ mRuntime = new EtchRuntime();
+ mRuntime->start();
+ }
+
+ virtual void TearDown() {
+ mRuntime->shutdown();
+ delete mRuntime;
+ mRuntime = NULL;
+ }
+
+ EtchRuntime* mRuntime;
+};
+
+TEST_F(EtchMessagizerTest, constructorTest) {
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchDefaultValueFactory * factory;
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ //created value factory
+ EtchURL u("tcp://127.0.0.1:4001");
+ EtchResources r;
+ EtchObject *out;
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchTransportPacket* pac = new EtchPacketizer(conn, &u);
- EtchSessionPacket* mes = new EtchMessagizer(pac, &u, &r);
-
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchTransportPacket* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchSessionPacket* mes = new EtchMessagizer(mRuntime, pac, &u, &r);
+
//Delete created stack
delete conn;
delete mes;
delete pac;
- delete factory;
- types.clear();
-}
-
+ delete factory;
+ types.clear();
+}
+
TEST_F(EtchMessagizerTest, TransportControlTest) {
EtchTypeMap types;
EtchClass2TypeMap class2type;
EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
EtchString uri("tcp://127.0.0.1:4001");
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
//created value factory
@@ -138,36 +133,36 @@ TEST_F(EtchMessagizerTest, TransportCont
EtchResources r;
EtchObject *out;
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
mess->setSession(&manager);
- EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchTcpListener* transport = new EtchTcpListener(mRuntime, &u);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener11(transport);
transport->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new EtchInt32(1000));
-
+
mess->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP()), new EtchInt32(1000));
//test transport commands
mess->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN()), new EtchInt32(1000));
transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()), new EtchInt32(1000));
-
+
delete conn;
delete mSessionListener;
delete pac;
delete mess;
- delete factory;
- types.clear();
-}
-
-TEST_F(EtchMessagizerTest, TransportMessageTest) {
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchDefaultValueFactory * factory;
+ delete factory;
+ types.clear();
+}
+
+TEST_F(EtchMessagizerTest, TransportMessageTest) {
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
EtchString uri("tcp://127.0.0.1:4001");
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
//default value factory
@@ -176,9 +171,9 @@ TEST_F(EtchMessagizerTest, TransportMess
EtchObject *out;
//add to the resource
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
mess->setSession(&manager);
//creation of example message which will be serialized
EtchType *mt_foo = NULL;
@@ -186,78 +181,78 @@ TEST_F(EtchMessagizerTest, TransportMess
EtchString str("foo");
factory->getType(str, mt_foo);
capu::SmartPointer<EtchValidator> v;
- EtchValidatorShort::Get(0, v);
+ EtchValidatorShort::Get(mRuntime, 0, v);
mt_foo->putValidator(mf_x, v);
capu::SmartPointer<EtchShort> data = new EtchShort(10000);
capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
msg->put(mf_x, data);
EXPECT_TRUE(mess->transportMessage(NULL, msg) == ETCH_ERROR);
-
+
delete conn;
delete mess;
delete pac;
- delete factory;
- types.clear();
-}
-
-TEST_F(EtchMessagizerTest, SessionDataTest) {
- //creation of an example message to compare the deserialized messageMyValueFactory vf("tcp:");
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchString name1("a");
- EtchString name2("b");
- EtchType *mt_foo = new EtchType(1, name1);
- EtchField mf_x(2, name2);
- capu::SmartPointer<EtchValidator> v;
- EtchValidatorShort::Get(0, v);
- mt_foo->putValidator(mf_x, v);
- types.add(mt_foo);
- capu::SmartPointer<EtchShort> data = new EtchShort(10000);
- //default value factory
- EtchDefaultValueFactory * factory;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
-
-
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
- msg->put(mf_x, data);
-
-
- EtchURL u(uri);
- EtchResources r;
- EtchObject *out;
- //add the value factory to the resources
+ delete factory;
+ types.clear();
+}
+
+TEST_F(EtchMessagizerTest, SessionDataTest) {
+ //creation of an example message to compare the deserialized messageMyValueFactory vf("tcp:");
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchString name1("a");
+ EtchString name2("b");
+ EtchType *mt_foo = new EtchType(1, name1);
+ EtchField mf_x(2, name2);
+ capu::SmartPointer<EtchValidator> v;
+ EtchValidatorShort::Get(mRuntime, 0, v);
+ mt_foo->putValidator(mf_x, v);
+ types.add(mt_foo);
+ capu::SmartPointer<EtchShort> data = new EtchShort(10000);
+ //default value factory
+ EtchDefaultValueFactory * factory;
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+
+
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
+ msg->put(mf_x, data);
+
+
+ EtchURL u(uri);
+ EtchResources r;
+ EtchObject *out;
+ //add the value factory to the resources
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- //create stack
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
-
- //A packet is created
- capu::int8_t byte_pos[] = {3, 1, 1, 2, -123, 39, 16, -127};
- buffer->setByteRepresentation(ETCH_BIG_ENDIAN);
- buffer->put((capu::int8_t *)"_header_", pac->getHeaderSize());
- buffer->put((capu::int8_t *)byte_pos, 8);
- buffer->setIndex(0);
- capu::int32_t pktsize = buffer->getLength() - pac->getHeaderSize();
- buffer->put((capu::int8_t *) & pac->SIG, sizeof (capu::int32_t));
- buffer->put((capu::int8_t *) & pktsize, sizeof (capu::int32_t));
- buffer->setIndex(pac->getHeaderSize());
- EXPECT_TRUE(buffer->getLength() == 16);
-
- //Simulate call with fake package
- EtchSessionMessage* mMailboxManager = new MockMailboxManager();
- mess->setSession(mMailboxManager);
- EXPECT_TRUE(mess->sessionPacket(NULL, buffer) == ETCH_OK);
-
- mess->setSession(NULL);
- types.clear();
+ //create stack
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+
+ //A packet is created
+ capu::int8_t byte_pos[] = {3, 1, 1, 2, -123, 39, 16, -127};
+ buffer->setByteRepresentation(ETCH_BIG_ENDIAN);
+ buffer->put((capu::int8_t *)"_header_", pac->getHeaderSize());
+ buffer->put((capu::int8_t *)byte_pos, 8);
+ buffer->setIndex(0);
+ capu::int32_t pktsize = buffer->getLength() - pac->getHeaderSize();
+ buffer->put((capu::int8_t *) & pac->SIG, sizeof (capu::int32_t));
+ buffer->put((capu::int8_t *) & pktsize, sizeof (capu::int32_t));
+ buffer->setIndex(pac->getHeaderSize());
+ EXPECT_TRUE(buffer->getLength() == 16);
+
+ //Simulate call with fake package
+ EtchSessionMessage* mMailboxManager = new MockMailboxManager();
+ mess->setSession(mMailboxManager);
+ EXPECT_TRUE(mess->sessionPacket(NULL, buffer) == ETCH_OK);
+
+ mess->setSession(NULL);
+ types.clear();
delete conn;
delete mMailboxManager;
delete pac;
delete mess;
- delete factory;
-}
+ delete factory;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp Wed Oct 17 06:50:01 2012
@@ -74,48 +74,43 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
-};
-
-class EtchPacketizerTest
- : public ::testing::Test {
-protected:
- virtual void SetUp() {
- mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
- mRuntime->start();
- }
-
- virtual void TearDown() {
- mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
- delete mRuntime;
- mRuntime = NULL;
- }
+};
+
+class EtchPacketizerTest
+ : public ::testing::Test {
+protected:
+ virtual void SetUp() {
+ mRuntime = new EtchRuntime();
+ mRuntime->start();
+ }
+
+ virtual void TearDown() {
+ mRuntime->shutdown();
+ delete mRuntime;
+ mRuntime = NULL;
+ }
EtchRuntime* mRuntime;
-};
-
-TEST_F(EtchPacketizerTest, constructorTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+};
+
+TEST_F(EtchPacketizerTest, constructorTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchSessionData* packetizer = new EtchPacketizer(conn, &u);
+ EtchSessionData* packetizer = new EtchPacketizer(mRuntime, conn, &u);
delete conn;
delete packetizer;
-
-}
-
-TEST_F(EtchPacketizerTest, TransportControlTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+
+}
+
+TEST_F(EtchPacketizerTest, TransportControlTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
MockMessagizer mes;
packetizer->setSession(&mes);
- EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchTcpListener* transport = new EtchTcpListener(mRuntime, &u);
EtchSessionListener<EtchSocket>* listener = new MockListener3(transport);
//Start the mock listener
@@ -128,34 +123,34 @@ TEST_F(EtchPacketizerTest, TransportCont
delete conn;
delete packetizer;
- delete listener;
-}
-
-TEST_F(EtchPacketizerTest, TransportPacketTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+ delete listener;
+}
+
+TEST_F(EtchPacketizerTest, TransportPacketTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
MockMessagizer mes;
packetizer->setSession(&mes);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
-
- //A packet is try to transmit data through not started transport
- buffer->put((capu::int8_t *)"_header_", packetizer->getHeaderSize());
- buffer->put((capu::int8_t *)"test", 4);
- buffer->setIndex(0);
-
- EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+
+ //A packet is try to transmit data through not started transport
+ buffer->put((capu::int8_t *)"_header_", packetizer->getHeaderSize());
+ buffer->put((capu::int8_t *)"test", 4);
+ buffer->setIndex(0);
+
+ EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
delete conn;
- delete packetizer;
-}
-
-TEST_F(EtchPacketizerTest, SessionDataTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+ delete packetizer;
+}
+
+TEST_F(EtchPacketizerTest, SessionDataTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
- //A packet is created
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+ //A packet is created
capu::int32_t pktsize = 4;
buffer->putInt(packetizer->SIG());
buffer->putInt(pktsize);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp Wed Oct 17 06:50:01 2012
@@ -79,8 +79,8 @@ public:
*/
public:
- MockDefaultValueFactory(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -95,16 +95,11 @@ class EtchPlainMailboxManagerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -117,11 +112,11 @@ TEST_F(EtchPlainMailboxManagerTest, cons
MockSession session;
MockDefaultValueFactory *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EXPECT_TRUE(manager != NULL);
manager->setSession(&session);
@@ -134,11 +129,11 @@ TEST_F(EtchPlainMailboxManagerTest, cons
TEST_F(EtchPlainMailboxManagerTest, transportMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -153,12 +148,12 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
EXPECT_TRUE(ETCH_OK == manager->transportMessage(NULL, message));
- EXPECT_EQ(0, manager->count());
+ EXPECT_EQ(0u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -175,11 +170,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, transportResultMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -197,12 +192,12 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
EXPECT_TRUE(ETCH_OK == manager->transportMessage(NULL, message));
- EXPECT_EQ(0, manager->count());
+ EXPECT_EQ(0u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK == message->getInReplyToMessageId(id));
EXPECT_TRUE(id == 1L);
@@ -219,11 +214,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, transportCallTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -238,7 +233,7 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -246,7 +241,7 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == manager->transportCall(NULL, message, mail));
- EXPECT_EQ(1, manager->count());
+ EXPECT_EQ(1u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -262,11 +257,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, replicatedTransportCallTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -284,7 +279,7 @@ TEST_F(EtchPlainMailboxManagerTest, repl
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -293,8 +288,7 @@ TEST_F(EtchPlainMailboxManagerTest, repl
EtchMailbox *mail;
EXPECT_TRUE(ETCH_ERROR == manager->transportCall(NULL, message, mail));
//should not create a mailbox
- EXPECT_EQ(0, manager->count());
- EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
+ EXPECT_EQ(ETCH_OK, message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
//there should be no mailbox
EXPECT_TRUE(ETCH_OK != manager->getMailbox(id, mail));
@@ -309,12 +303,12 @@ TEST_F(EtchPlainMailboxManagerTest, repl
TEST_F(EtchPlainMailboxManagerTest, sessionMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
EtchType * replyType;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -332,7 +326,7 @@ TEST_F(EtchPlainMailboxManagerTest, sess
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -341,7 +335,7 @@ TEST_F(EtchPlainMailboxManagerTest, sess
//perform the call
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == manager->transportCall(NULL, message, mail));
- EXPECT_EQ(1, manager->count());
+ EXPECT_EQ(1u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
//get the created mailbox
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp Wed Oct 17 06:50:01 2012
@@ -84,16 +84,11 @@ class EtchTcpConnectionTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -111,7 +106,7 @@ TEST_F(EtchTcpConnectionTest, constructo
TEST_F(EtchTcpConnectionTest, isStartedTest) {
EtchURL url("tcp://127.0.0.1:4001");
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
EXPECT_FALSE(conn->isStarted());
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
EtchSessionData* mPacketizer = new MockPacketizer();
@@ -141,7 +136,7 @@ TEST_F(EtchTcpConnectionTest, SessionAcc
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
EtchSessionData* mPacketizer = new MockPacketizer();
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
//START THE LISTENER
listener->setSession(mSessionListener);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp Wed Oct 17 06:50:01 2012
@@ -74,16 +74,11 @@ class EtchTcpListenerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ protected:
TEST_F(EtchTcpListenerTest, constructorTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpListener * tcpListener = new EtchTcpListener(&url);
+ EtchTcpListener * tcpListener = new EtchTcpListener(mRuntime, &url);
EXPECT_TRUE(tcpListener != NULL);
delete tcpListener;
}
@@ -101,7 +96,7 @@ TEST_F(EtchTcpListenerTest, constructorT
TEST_F(EtchTcpListenerTest, transportControlTest) {
MockListener2 mock;
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpListener * tcpListener = new EtchTcpListener(&url);
+ EtchTcpListener * tcpListener = new EtchTcpListener(mRuntime, &url);
tcpListener->setSession(&mock);
tcpListener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new EtchInt32(1000));
EXPECT_TRUE(tcpListener->isStarted());
@@ -111,10 +106,10 @@ TEST_F(EtchTcpListenerTest, transportCon
TEST_F(EtchTcpListenerTest, isStartedTest) {
// TODO refactor this test
-
+
EtchURL url("tcp://127.0.0.1:4001");
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener2();
EtchSessionData* mPacketizer = new MockPacketizer2();
EXPECT_FALSE(listener->isStarted());
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp Wed Oct 17 06:50:01 2012
@@ -38,7 +38,7 @@ TEST(EtchCirclerQueueTest, putAndGetTest
EXPECT_EQ(ETCH_EINVAL, queue->get(&e1, -1));
EXPECT_EQ(ETCH_TIMEOUT, queue->get(&e1, 1));
- EXPECT_EQ(0, queue->getCount());
+ EXPECT_EQ(0u, queue->getCount());
EXPECT_TRUE(queue->isEmpty());
EXPECT_FALSE(queue->isFull());
@@ -51,7 +51,7 @@ TEST(EtchCirclerQueueTest, putAndGetTest
EXPECT_EQ(ETCH_OK, queue->get(&e3));
EXPECT_EQ(e2, e3);
- EXPECT_EQ(0, queue->getCount());
+ EXPECT_EQ(0u, queue->getCount());
EXPECT_TRUE(queue->isEmpty());
delete e2;
}
Modified: incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch (original)
+++ incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch Wed Oct 17 06:50:01 2012
@@ -29,6 +29,7 @@ service HelloWorld {
)
@Direction(Server)
+ @Timeout(1305)
string say_hello(user to_whom) throws UserUnknownException
}
Author: veithm
Date: Wed Oct 17 06:50:01 2012
New Revision: 1399114
URL: http://svn.apache.org/viewvc?rev=1399114&view=rev
Log:
ETCH-244 EtchRuntime refactoring
replaced EtchRuntime::getRuntime with mRuntime given by the constructor
Fixed Warnings under Linux
Change-Id: I2a22bf7f0f3418ca2e1aa5a60921b4cbc2f80ada
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataInput.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataOutput.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchDefaultServerFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchTransportHelper.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchDefaultDeliveryService.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPlainMailboxManager.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/util/EtchCircularQueue.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/src/util/Logger.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchDefaultServerFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchAuthenticationExceptionSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDateSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchListSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchRuntimeExceptionSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchSetSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp
incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch
incubator/etch/trunk/examples/helloworld/java/.classpath
incubator/etch/trunk/examples/helloworld/java/src/main/org/apache/etch/examples/helloworld/ImplHelloWorldServer.java
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h Wed Oct 17 06:50:01 2012
@@ -507,7 +507,7 @@ public:
/**
* Returns the dim of array
*/
- virtual capu::int32_t getDim() = 0;
+ virtual capu::uint32_t getDim() = 0;
};
@@ -585,7 +585,7 @@ public:
/**
* Returns the dim of array
*/
- capu::int32_t getDim();
+ capu::uint32_t getDim();
/**
* Creates a new nested array
@@ -636,7 +636,6 @@ EtchNativeArray<T>::EtchNativeArray(capu
mData->set(0, 0, array, length, 0, length, &bytesWritten);
} else if (dim == 2) {
mData = new EtchArray<T>(length, dim);
- capu::int32_t dimCount = dim;
capu::int32_t offset = 0;
for (capu::int32_t i = 0; i < length; i++) {
mData->createArray(i, 0, 2,dim-1);
@@ -711,7 +710,7 @@ capu::int32_t EtchNativeArray<T>::getLen
}
template<class T>
-capu::int32_t EtchNativeArray<T>::getDim() {
+capu::uint32_t EtchNativeArray<T>::getDim() {
return mData->getDim();
}
@@ -779,6 +778,9 @@ status_t EtchNativeArray<T>::resize(capu
} \
break; \
} \
+ default: { \
+ return ETCH_ERROR; \
+ } \
} \
}
@@ -811,7 +813,7 @@ status_t EtchNativeArray<T>::resize(capu
} \
break; \
} \
- case EtchObjectType::SMART_POINTER: \
+ case EtchObjectType::SMART_POINTER: { \
EtchNativeArray<capu::SmartPointer<type> >* na = (EtchNativeArray<capu::SmartPointer<type> >*)(this); \
if(dims == 1) { \
capu::SmartPointer<type> value = capu::smartpointer_cast<type> (data); \
@@ -822,6 +824,10 @@ status_t EtchNativeArray<T>::resize(capu
} \
break; \
} \
+ default: { \
+ break; \
+ } \
+ } \
break; \
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchAuthenticationExceptionSerializer.h Wed Oct 17 06:50:01 2012
@@ -36,7 +36,7 @@ public:
/**
* Constructor
*/
- EtchAuthenticationExceptionSerializer(EtchType* type, EtchField* field);
+ EtchAuthenticationExceptionSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field);
/**
* Destructor
@@ -53,7 +53,7 @@ public:
* @param type
* @param collection
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataInput.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataInput.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataInput.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataInput.h Wed Oct 17 06:50:01 2012
@@ -33,10 +33,10 @@ public:
/**
* Constructs the BinaryTaggedDataInput with a null buffer.
- *
+ *
* @param vf the value factory for the service.
*/
- EtchBinaryTaggedDataInput(EtchValueFactory *vf);
+ EtchBinaryTaggedDataInput(EtchRuntime* runtime, EtchValueFactory *vf);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataOutput.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataOutput.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataOutput.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchBinaryTaggedDataOutput.h Wed Oct 17 06:50:01 2012
@@ -43,7 +43,7 @@ public:
* @param vf the value factory for the service.
* @param uri.
*/
- EtchBinaryTaggedDataOutput(EtchValueFactory *vf, EtchURL* uri);
+ EtchBinaryTaggedDataOutput(EtchRuntime* runtime, EtchValueFactory *vf, EtchURL* uri);
/**
* Destructor
@@ -58,8 +58,8 @@ public:
private:
EtchRuntime* mRuntime;
- capu::SmartPointer<EtchFlexBuffer> mBuffer;
EtchLevel mLevel;
+ capu::SmartPointer<EtchFlexBuffer> mBuffer;
capu::bool_t mStringTypeAndField;
capu::SmartPointer<EtchValidator> mIntValidator;
capu::SmartPointer<EtchValidator> mStringValidator;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDateSerializer.h Wed Oct 17 06:50:01 2012
@@ -35,7 +35,7 @@ public:
/**
* Constructor
*/
- EtchDateSerializer(EtchType* type, EtchField* field);
+ EtchDateSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field);
/**
* Destructor
@@ -58,7 +58,7 @@ public:
* @param type
* @param collection
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h Wed Oct 17 06:50:01 2012
@@ -98,7 +98,7 @@ protected:
public:
- static status_t Init(EtchTypeMap* types, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchTypeMap* types, EtchClass2TypeMap* class2type);
/**
* The msg field of the standard unchecked exception.
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h Wed Oct 17 06:50:01 2012
@@ -37,7 +37,7 @@ public:
/**
* Constructor
*/
- EtchHashTableSerializer(EtchType* type, EtchField& field);
+ EtchHashTableSerializer(EtchRuntime* runtime, EtchType* type, EtchField& field);
/**
* Destructor
@@ -59,7 +59,7 @@ public:
* @param type
* @param collection
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchListSerializer.h Wed Oct 17 06:50:01 2012
@@ -36,7 +36,7 @@ public:
/**
* Constructor
*/
- EtchListSerializer(EtchType* type, EtchField* field);
+ EtchListSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field);
/**
* Destructor
@@ -58,12 +58,12 @@ public:
* @param type
* @param class2type
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
- EtchType* mType;
EtchField mField;
+ EtchType* mType;
const static EtchString& FIELD_NAME();
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchRuntimeExceptionSerializer.h Wed Oct 17 06:50:01 2012
@@ -37,7 +37,7 @@ public:
/**
* Constructor
*/
- EtchRuntimeExceptionSerializer(EtchType* type, EtchField* field);
+ EtchRuntimeExceptionSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field);
/**
* Destructor
@@ -59,12 +59,12 @@ public:
* @param type
* @param class2type
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
- EtchType* mType;
EtchField mField;
+ EtchType* mType;
const static EtchString& FIELD_NAME();
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchSetSerializer.h Wed Oct 17 06:50:01 2012
@@ -37,7 +37,7 @@ public:
/**
* Constructor
*/
- EtchSetSerializer(EtchType* type, EtchField* field);
+ EtchSetSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field);
/**
* Destructor
@@ -53,7 +53,7 @@ public:
* @param type
* @param collection
*/
- static status_t Init(EtchType* type, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h Wed Oct 17 06:50:01 2012
@@ -61,10 +61,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorBoolean(capu::uint32_t ndim);
+ EtchValidatorBoolean(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h Wed Oct 17 06:50:01 2012
@@ -66,15 +66,15 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorByte(capu::uint32_t ndim);
+ EtchValidatorByte(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
static capu::SmartPointer<EtchValidator>* Validators(EtchRuntime* runtime);
-
+
};
#endif /* ETCHVALIDATORBYTE_H */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h Wed Oct 17 06:50:01 2012
@@ -110,7 +110,7 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, const EtchObjectType *type, capu::bool_t sub, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, const EtchObjectType *type, capu::bool_t sub, capu::SmartPointer<EtchValidator> &val);
protected:
@@ -120,9 +120,10 @@ protected:
* @param dim dimensions
* @param sub is subclass ok
*/
- EtchValidatorCustom(const EtchObjectType *type, capu::uint32_t ndim, capu::bool_t sub);
+ EtchValidatorCustom(EtchRuntime* runtime, const EtchObjectType *type, capu::uint32_t ndim, capu::bool_t sub);
private:
+ EtchRuntime* mRuntime;
static EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >& Validators(EtchRuntime* runtime);
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h Wed Oct 17 06:50:01 2012
@@ -63,10 +63,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorDouble(capu::uint32_t ndim);
+ EtchValidatorDouble(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h Wed Oct 17 06:50:01 2012
@@ -63,10 +63,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorFloat(capu::uint32_t ndim);
+ EtchValidatorFloat(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h Wed Oct 17 06:50:01 2012
@@ -67,12 +67,12 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorInt(capu::uint32_t ndim);
+ EtchValidatorInt(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h Wed Oct 17 06:50:01 2012
@@ -65,10 +65,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorLong(capu::uint32_t ndim);
+ EtchValidatorLong(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h Wed Oct 17 06:50:01 2012
@@ -54,12 +54,12 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val);
static const EtchObjectType* TYPE();
protected:
- EtchValidatorNone();
+ EtchValidatorNone(EtchRuntime* runtime);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h Wed Oct 17 06:50:01 2012
@@ -60,10 +60,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorObject(capu::uint32_t ndim);
+ EtchValidatorObject(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h Wed Oct 17 06:50:01 2012
@@ -54,7 +54,7 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val);
/**
* EtchObjectType for EtchValidatorRuntimeException.
@@ -62,7 +62,7 @@ public:
static const EtchObjectType* TYPE();
protected:
- EtchValidatorRuntimeException();
+ EtchValidatorRuntimeException(EtchRuntime* runtime);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h Wed Oct 17 06:50:01 2012
@@ -66,11 +66,11 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorShort(capu::uint32_t ndim);
+ EtchValidatorShort(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h Wed Oct 17 06:50:01 2012
@@ -61,10 +61,10 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
protected:
- EtchValidatorString(capu::uint32_t ndim);
+ EtchValidatorString(EtchRuntime* runtime, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h Wed Oct 17 06:50:01 2012
@@ -57,7 +57,7 @@ public:
/**
* @see EtchValidator
*/
- static status_t Get(EtchType* type, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
+ static status_t Get(EtchRuntime* runtime, EtchType* type, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
/**
* EtchObjectType for EtchRuntimeException.
@@ -68,7 +68,7 @@ public:
protected:
- EtchValidatorStructValue(EtchType* type, capu::uint32_t ndim);
+ EtchValidatorStructValue(EtchRuntime* runtime, EtchType* type, capu::uint32_t ndim);
private:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h Wed Oct 17 06:50:01 2012
@@ -81,8 +81,8 @@ public:
}
private:
- capu::bool_t mHasResult;
- capu::SmartPointer<T> mResult;
+ capu::SmartPointer<T> mResult;
+ capu::bool_t mHasResult;
};
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchDefaultServerFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchDefaultServerFactory.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchDefaultServerFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchDefaultServerFactory.h Wed Oct 17 06:50:01 2012
@@ -85,8 +85,8 @@ public:
virtual status_t transportQuery(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject> *result);
private:
- EtchSession* mSession;
EtchTransport<EtchServerFactory>* mListener;
+ EtchSession* mSession;
};
#endif /* __ETCHDEFAULTSERVERFACTORY_H__*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h Wed Oct 17 06:50:01 2012
@@ -40,7 +40,7 @@ public:
* @param svc the delivery service used to send messages.
* @param vf the value factory used to create messages and encode/decode types.
*/
- EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack);
+ EtchRemoteBase(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack);
/**
* Destructor
@@ -190,8 +190,8 @@ public:
private:
EtchRuntime* mRuntime;
EtchDeliveryService * mSvc;
- EtchStack* mStack;
EtchValueFactory* mVf;
+ EtchStack* mStack;
};
#endif /* __ETCHREMOTBASE_H__ */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h Wed Oct 17 06:50:01 2012
@@ -86,28 +86,16 @@ public:
status_t shutdown();
/**
- * Sets Logger
- * @param logger
- */
- status_t setLogger(EtchLogger* logger);
-
- /**
* Gets Logger
* @return logger if exists
*/
- EtchLogger* getLogger();
-
- /**
- * TODO: Remove this after refactoring! A instance to the runtime shoulde be injected to each class
- */
- static EtchRuntime* getRuntime();
+ EtchLogger& getLogger();
private:
- static EtchRuntime* sRuntime;
+ capu::bool_t mIsClosed;
+ EtchLogger mLogger;
static capu::uint64_t sId;
capu::uint64_t mId;
- EtchLogger* mLogger;
- capu::bool_t mIsClosed;
capu::Mutex mMutex;
capu::List<EtchRuntimeListener*> mListeners;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h Wed Oct 17 06:50:01 2012
@@ -21,6 +21,8 @@
#include "support/EtchStack.h"
#include "util/EtchResources.h"
+class EtchRuntime;
+
/* *
* This class serves as a container for all layers created during the setup of a new stack (connection, packetizer, messagizer, ...).
*/
@@ -35,7 +37,7 @@ public:
/**
* Default Constructor
*/
- EtchStackClient();
+ EtchStackClient(EtchRuntime* runtime);
/**
* Copy Constructor
@@ -48,9 +50,8 @@ public:
virtual ~EtchStackClient();
public:
+ EtchRuntime* mRuntime;
EtchResources* mStaticResources;
-
-
};
#endif /* __ETCHSTACKCLIENT_H__ */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchTransportHelper.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchTransportHelper.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchTransportHelper.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchTransportHelper.h Wed Oct 17 06:50:01 2012
@@ -22,6 +22,8 @@
#include "common/EtchString.h"
#include "util/EtchResources.h"
+class EtchRuntime;
+
/**
* Class to help construct transport stacks.
*/
@@ -63,7 +65,7 @@ public:
* @return an error if there is a problem
* ETCH_OK otherwise
*/
- static status_t InitResources( EtchResources* resources, EtchResources*& result );
+ static status_t InitResources(EtchRuntime* runtime, EtchResources* resources, EtchResources*& result);
/**
* Destroyes the given standard resources
@@ -71,7 +73,7 @@ public:
* @return an error if there is a problem
* ETCH_OK otherwise
*/
- static status_t DestroyResources(EtchResources* resources);
+ static status_t DestroyResources(EtchRuntime* runtime, EtchResources* resources);
};
#endif /* __ETCHTRANSPORTHELPER_H__ */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchDefaultDeliveryService.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchDefaultDeliveryService.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchDefaultDeliveryService.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchDefaultDeliveryService.h Wed Oct 17 06:50:01 2012
@@ -50,14 +50,14 @@ public:
* @param transport the MailBoxManager implementation
* @param uri as an EtchString object
*/
- EtchDefaultDeliveryService(EtchMailboxManager* transport, const EtchString& uri);
+ EtchDefaultDeliveryService(EtchRuntime* runtime, EtchMailboxManager* transport, const EtchString& uri);
/**
* Constructor
* @param transport the MailBoxManager implementation
* @param uri as an EtchURL object
*/
- EtchDefaultDeliveryService(EtchMailboxManager* transport, EtchURL* uri);
+ EtchDefaultDeliveryService(EtchRuntime* runtime, EtchMailboxManager* transport, EtchURL* uri);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessagizer.h Wed Oct 17 06:50:01 2012
@@ -55,7 +55,7 @@ public:
* @param uri the uri being used to configure the transport stack.
* @param resources the associated set of resources for this service.
*/
- EtchMessagizer(EtchTransportPacket* transport, EtchURL* uri, EtchResources* resources);
+ EtchMessagizer(EtchRuntime* runtime, EtchTransportPacket* transport, EtchURL* uri, EtchResources* resources);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h Wed Oct 17 06:50:01 2012
@@ -61,7 +61,7 @@ public:
* @param uri
* @param resources
*/
- EtchPacketizer(EtchTransportData* transport, EtchString& uri);
+ EtchPacketizer(EtchRuntime* runtime, EtchTransportData* transport, EtchString& uri);
/**
* Constructs the Packetizer with null packet handler and uri specified
@@ -70,7 +70,7 @@ public:
* @param uri
* @param resources
*/
- EtchPacketizer(EtchTransportData* transport, EtchURL* uri);
+ EtchPacketizer(EtchRuntime* runtime, EtchTransportData* transport, EtchURL* uri);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPlainMailboxManager.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPlainMailboxManager.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPlainMailboxManager.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchPlainMailboxManager.h Wed Oct 17 06:50:01 2012
@@ -37,7 +37,7 @@ public:
* @param uri
* @param resources
*/
- EtchPlainMailboxManager(EtchTransportMessage* transport, const EtchString& url, EtchResources* resources);
+ EtchPlainMailboxManager(EtchRuntime* runtime, EtchTransportMessage* transport, const EtchString& url, EtchResources* resources);
/**
* Destructure
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h Wed Oct 17 06:50:01 2012
@@ -135,12 +135,12 @@ public:
void setNumAttempts(capu::uint8_t numAttempts);
private:
+ EtchRuntime *mRuntime;
EtchString mHost;
capu::uint16_t mPort;
EtchSocket* mSocket;
EtchTcpOption mOptions;
capu::uint8_t mNumAttempts;
- EtchRuntime *mRuntime;
protected:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h Wed Oct 17 06:50:01 2012
@@ -48,7 +48,7 @@ public:
/**
* Default Constructor
*/
- EtchTcpListener(EtchURL *url);
+ EtchTcpListener(EtchRuntime* runtime, EtchURL *url);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h Wed Oct 17 06:50:01 2012
@@ -70,8 +70,8 @@ public:
private:
static const EtchString& SOCKET();
- const capu::bool_t mIsSecure;
EtchRuntime* mRuntime;
+ const capu::bool_t mIsSecure;
class MySessionListener : public EtchTransport<EtchServerFactory>, public EtchSessionListener<EtchSocket> {
public:
@@ -137,15 +137,14 @@ private:
status_t sessionNotify(capu::SmartPointer<EtchObject> event);
private:
+ EtchRuntime* mRuntime;
+ EtchTcpTransportFactory* mFactory;
EtchTransport<EtchSessionListener<EtchSocket> > *mTransport;
EtchString mUri;
EtchResources* mResources;
- EtchServerFactory* mSession;
- EtchRuntime* mRuntime;
capu::bool_t mIsSecure;
+ EtchServerFactory* mSession;
capu::List<EtchStack*>* mConnectionStacks;
- EtchTcpTransportFactory* mFactory;
-
};
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/util/EtchCircularQueue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/util/EtchCircularQueue.h?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/util/EtchCircularQueue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/util/EtchCircularQueue.h Wed Oct 17 06:50:01 2012
@@ -88,10 +88,10 @@ public:
/**
* Gets the next available item from the queue, waiting
* until an item is available or the queue is closed.
- *
+ *
* @param element an item from the queue or null if the queue
* is closed
- * @return ETCH_OK if the item could be dequeued, ETCH_EINVAL if
+ * @return ETCH_OK if the item could be dequeued, ETCH_EINVAL if
* the param is invalid or ETCH_ERROR if the queue is closed.
*/
status_t get(EtchMailbox::EtchElement** element);
@@ -99,14 +99,14 @@ public:
/**
* Gets the next available item from the queue, waiting
* until an item is available or the queue is closed.
- *
+ *
* @param element an item from the queue or null if maxDelay
* has been exceeded or the queue is closed.
* @param maxDelay the maximum time in ms to wait for
* something to be put in the queue; 0 means wait forever,
* less than 0 means don't wait at all.
*
- * @return ETCH_OK if the item could be dequeued, ETCH_EINVAL if
+ * @return ETCH_OK if the item could be dequeued, ETCH_EINVAL if
* the param is invalid, ETCH_TIMEOUT if maxDelay has been exceeded
* or ETCH_ERROR if an error occurred
*/
@@ -115,10 +115,10 @@ public:
/**
* Puts an item in the queue, waiting until space is available
* or the queue is closed.
- *
+ *
* @param obj a non-null item to put in the queue.
- *
- * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
+ *
+ * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
* the param is invalid or ETCH_ERROR if the queue is closed.
*/
status_t put(EtchMailbox::EtchElement* obj);
@@ -126,17 +126,17 @@ public:
/**
* Puts an item in the queue, waiting until space is available
* or the queue is closed.
- *
+ *
* @param obj a non-null item to put in the queue.
- *
+ *
* @param maxDelay the maximum time in ms to wait for
* available space the queue; 0 means wait forever,
* less than 0 means don't wait at all.
- *
- * @return ETCH_OK if the item was placed in the queue,
+ *
+ * @return ETCH_OK if the item was placed in the queue,
* ETCH_TIMEOUT if maxDelay has been exceeded or ETCH_ERROR if an error occurred
*/
- status_t put(EtchMailbox::EtchElement* obj, capu::int32_t maxDelay);
+ status_t put(EtchMailbox::EtchElement* obj, capu::int32_t maxDelay);
/**
* Closes the queue so that no more items may be put into it.
@@ -166,7 +166,7 @@ private:
* up the next one waiting for the queue, either to get or put.
* @param obj non-null item to put.
*
- * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
+ * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
* the param is invalid or ETCH_ERROR if the queue is closed.
*/
status_t putAndNotify(EtchMailbox::EtchElement* obj);
@@ -184,7 +184,7 @@ private:
* Puts the item at the tail of the queue.
* @param obj non-null item to put.
*
- * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
+ * @return ETCH_OK if the item was placed in the queue, ETCH_EINVAL if
* the param is invalid or ETCH_ERROR if the queue is closed.
*/
status_t put0(EtchMailbox::EtchElement* obj);
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/src/util/Logger.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/src/util/Logger.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/src/util/Logger.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/src/util/Logger.cpp Wed Oct 17 06:50:01 2012
@@ -98,31 +98,29 @@ namespace capu {
return CAPU_OK;
}
- status_t Logger::vlog(LoggerLevel level, const char *tag, const char *file, int32_t line, const char *msgFormat, va_list args) {
+ status_t Logger::vlog(LoggerLevel level, const char_t *tag, const char_t *file, int32_t line, const char_t *msgFormat, va_list args) {
- LoggerMessage *msg = new LoggerMessage();
- msg->setId(mId);
- msg->setTimestamp(0); // not implemented
- msg->setThreadId(0); // not implemented
- msg->setLevel(level);
- msg->setTag(tag);
- msg->setFile(file);
- msg->setLine(line);
+ LoggerMessage msg;
+ msg.setId(mId);
+ msg.setTimestamp(0); // not implemented
+ msg.setThreadId(0); // not implemented
+ msg.setLevel(level);
+ msg.setTag(tag);
+ msg.setFile(file);
+ msg.setLine(line);
int32_t size = StringUtils::Vscprintf(msgFormat, args);
- char* buffer = new char[size + 1];
+ char_t* buffer = new char_t[size + 1];
StringUtils::Vsprintf(buffer, size + 1, msgFormat, args);
- msg->setMessage(buffer);
+ msg.setMessage(buffer);
delete [] buffer;
// log message
for(int i = 0; i < LOGGER_APPENDER_MAX; i++) {
if(mAppenders[i] != NULL) {
- mAppenders[i]->log(msg);
+ mAppenders[i]->log(&msg);
}
}
- delete msg;
-
return CAPU_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchNativeArray.cpp Wed Oct 17 06:50:01 2012
@@ -35,7 +35,7 @@ status_t EtchNativeArrayBase::getBase(Po
status_t ret = ETCH_OK;
const EtchObjectType* type = getObjectType()->getObjectComponentType();
const EtchObjectType::EtchObjectTypeTrait trait = getObjectType()->getObjectComponentTypeTrait();
- const capu::int32_t dims = getDim();
+ const capu::uint32_t dims = getDim();
switch(type->getTypeId()) {
case EOTID_BYTE: {
@@ -76,7 +76,7 @@ status_t EtchNativeArrayBase::getBase(Po
}
break;
}
- case EtchObjectType::SMART_POINTER:
+ case EtchObjectType::SMART_POINTER: {
EtchNativeArray<capu::SmartPointer<capu::int8_t> >* na = (EtchNativeArray<capu::SmartPointer<capu::int8_t> >*)(this);
if(dims == 1) {
capu::SmartPointer<capu::int8_t> value = NULL;
@@ -93,6 +93,10 @@ status_t EtchNativeArrayBase::getBase(Po
}
break;
}
+ default: {
+ return ETCH_ERROR;
+ }
+ }
break;
}
@@ -185,6 +189,9 @@ status_t EtchNativeArrayBase::getBase(Po
}
break;
}
+ default: {
+ return ETCH_ERROR;
+ }
}
break;
}
@@ -196,6 +203,9 @@ status_t EtchNativeArrayBase::getBase(Po
GETBASE_CAST_OBJECT_TO_NA(EtchList<capu::SmartPointer<EtchObject> > )
break;
}
+ default: {
+ return ETCH_ERROR;
+ }
}
return ret;
}
@@ -238,7 +248,7 @@ status_t EtchNativeArrayBase::setBase(Po
}
break;
}
- case EtchObjectType::SMART_POINTER:
+ case EtchObjectType::SMART_POINTER: {
EtchNativeArray<capu::SmartPointer<capu::int8_t> >* na = (EtchNativeArray<capu::SmartPointer<capu::int8_t> >*)(this);
if(dims == 1) {
capu::SmartPointer<EtchInt32> value = capu::smartpointer_cast<EtchInt32> (data);
@@ -254,6 +264,10 @@ status_t EtchNativeArrayBase::setBase(Po
}
break;
}
+ default: {
+ break;
+ }
+ }
break;
}
case EOTID_OBJECT: {
@@ -319,7 +333,7 @@ status_t EtchNativeArrayBase::setBase(Po
}
break;
}
- case EtchObjectType::SMART_POINTER:
+ case EtchObjectType::SMART_POINTER: {
EtchNativeArray<capu::SmartPointer<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > >* na = (EtchNativeArray<capu::SmartPointer<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > >*)(this);
if(dims == 1) {
capu::SmartPointer<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > value = capu::smartpointer_cast<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > (data);
@@ -330,6 +344,10 @@ status_t EtchNativeArrayBase::setBase(Po
}
break;
}
+ default: {
+ break;
+ }
+ }
break;
}
case EOTID_SET: {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -26,10 +26,8 @@ const EtchString& EtchAuthenticationExce
return name;
}
-EtchAuthenticationExceptionSerializer::EtchAuthenticationExceptionSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
- // TODO refactor
- mRuntime = EtchRuntime::getRuntime();
+EtchAuthenticationExceptionSerializer::EtchAuthenticationExceptionSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
+: mRuntime(runtime), mField(*field), mType(type) {
}
EtchAuthenticationExceptionSerializer::~EtchAuthenticationExceptionSerializer() {
@@ -66,10 +64,7 @@ status_t EtchAuthenticationExceptionSeri
return ETCH_OK;
}
-status_t EtchAuthenticationExceptionSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
- // TODO refactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchAuthenticationExceptionSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type) {
status_t result;
EtchField field;
@@ -86,11 +81,11 @@ status_t EtchAuthenticationExceptionSeri
type->setComponentType(EtchAuthenticationException::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchAuthenticationExceptionSerializer(type, &field));
+ type->setImportExportHelper(new EtchAuthenticationExceptionSerializer(runtime, type, &field));
//get validator
capu::SmartPointer<EtchValidator> tmp;
- result = EtchValidatorString::Get(0, tmp);
+ result = EtchValidatorString::Get(runtime, 0, tmp);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp Wed Oct 17 06:50:01 2012
@@ -21,17 +21,14 @@
static const char* TAG = "EtchBinaryTaggedDataInput";
-EtchBinaryTaggedDataInput::EtchBinaryTaggedDataInput(EtchValueFactory* vf)
-: EtchBinaryTaggedData(vf), mBuffer(NULL), mLengthBudget(0) {
- // TODO refacotring
- mRuntime = EtchRuntime::getRuntime();
-
+EtchBinaryTaggedDataInput::EtchBinaryTaggedDataInput(EtchRuntime* runtime, EtchValueFactory* vf)
+: EtchBinaryTaggedData(vf), mRuntime(runtime), mBuffer(NULL), mLengthBudget(0) {
//get int validator
- EtchValidatorInt::Get(0, mIntValidator);
+ EtchValidatorInt::Get(runtime, 0, mIntValidator);
//get string validator
capu::SmartPointer<EtchValidator> stringValidator;
- EtchValidatorString::Get(0, stringValidator);
+ EtchValidatorString::Get(runtime, 0, stringValidator);
//create combo validator
mIntOrStrValidator = new EtchComboValidator(mIntValidator, stringValidator);
@@ -149,7 +146,7 @@ status_t EtchBinaryTaggedDataInput::read
} else {
capu::SmartPointer<EtchObject> obj;
capu::SmartPointer<EtchValidator> val;
- EtchValidatorObject::Get(0, val);
+ EtchValidatorObject::Get(mRuntime, 0, val);
readValue(val, obj);
}
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp Wed Oct 17 06:50:01 2012
@@ -25,21 +25,17 @@ const EtchString& EtchBinaryTaggedDataOu
return name;
}
-EtchBinaryTaggedDataOutput::EtchBinaryTaggedDataOutput(EtchValueFactory *vf, EtchURL* uri)
-: EtchBinaryTaggedData(vf), mLevel(vf->getLevel()), mBuffer(NULL) {
- // TODO refactoring
- mRuntime = EtchRuntime::getRuntime();
-
+EtchBinaryTaggedDataOutput::EtchBinaryTaggedDataOutput(EtchRuntime* runtime, EtchValueFactory *vf, EtchURL* uri)
+: EtchBinaryTaggedData(vf), mRuntime(runtime), mLevel(vf->getLevel()), mBuffer(NULL) {
EtchString tmp;
if (uri->getTerms().get(STRING_TYPE_AND_FIELD(), &tmp) == ETCH_OK) {
mStringTypeAndField = atoi(tmp.c_str()) > 0;
} else {
mStringTypeAndField = false;
}
- EtchValidatorInt::Get(0, mIntValidator);
- EtchValidatorString::Get(0, mStringValidator);
- EtchValidatorNone::Get(mNoneValidator);
-
+ EtchValidatorInt::Get(runtime, 0, mIntValidator);
+ EtchValidatorString::Get(runtime, 0, mStringValidator);
+ EtchValidatorNone::Get(runtime, mNoneValidator);
}
EtchBinaryTaggedDataOutput::~EtchBinaryTaggedDataOutput() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -26,10 +26,8 @@ const EtchString& EtchDateSerializer::FI
return name;
}
-EtchDateSerializer::EtchDateSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchDateSerializer::EtchDateSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
+: mRuntime(runtime), mField(*field), mType(type) {
}
EtchDateSerializer::~EtchDateSerializer() {
@@ -67,10 +65,8 @@ status_t EtchDateSerializer::exportValue
return ETCH_OK;
}
-status_t EtchDateSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
- //TODO refactoring
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchDateSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type) {
+
status_t result;
EtchField field;
@@ -87,11 +83,11 @@ status_t EtchDateSerializer::Init(EtchTy
type->setComponentType(EtchDate::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchDateSerializer(type, &field));
+ type->setImportExportHelper(new EtchDateSerializer(runtime, type, &field));
//get validator
capu::SmartPointer<EtchValidator> val;
- result = EtchValidatorLong::Get(0, val);
+ result = EtchValidatorLong::Get(runtime, 0, val);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp Wed Oct 17 06:50:01 2012
@@ -131,39 +131,40 @@ EtchDefaultValueFactory::~EtchDefaultVal
delete mDynamicTypes;
}
-status_t EtchDefaultValueFactory::Init(EtchTypeMap* types, EtchClass2TypeMap* class2type) {
- status_t result;
+status_t EtchDefaultValueFactory::Init(EtchRuntime* runtime, EtchTypeMap* types, EtchClass2TypeMap* class2type) {
+ status_t result = ETCH_OK;
EtchType *type;
- result = types->get(ETCH_RUNTIME_EXCEPTION_TYPE_NAME(), type);
- result = EtchRuntimeExceptionSerializer::Init(type, class2type);
+ result |= types->get(ETCH_RUNTIME_EXCEPTION_TYPE_NAME(), type);
- result = types->get(ETCH_LIST_TYPE_NAME(), type);
- result = EtchListSerializer::Init(type, class2type);
+ result |= EtchRuntimeExceptionSerializer::Init(runtime, type, class2type);
- result = types->get(ETCH_MAP_TYPE_NAME(), type);
- result = EtchHashTableSerializer::Init(type, class2type);
+ result |= types->get(ETCH_LIST_TYPE_NAME(), type);
+ result |= EtchListSerializer::Init(runtime, type, class2type);
- result = types->get(ETCH_SET_TYPE_NAME(), type);
- result = EtchSetSerializer::Init(type, class2type);
+ result |= types->get(ETCH_MAP_TYPE_NAME(), type);
+ result |= EtchHashTableSerializer::Init(runtime, type, class2type);
- result = types->get(ETCH_DATETIME_TYPE_NAME(), type);
- result = EtchDateSerializer::Init(type, class2type);
+ result |= types->get(ETCH_SET_TYPE_NAME(), type);
+ result |= EtchSetSerializer::Init(runtime, type, class2type);
- result = types->get(ETCH_AUTH_EXCEPTION_TYPE_NAME(), type);
- result = EtchAuthenticationExceptionSerializer::Init(type, class2type);
+ result |= types->get(ETCH_DATETIME_TYPE_NAME(), type);
+ result |= EtchDateSerializer::Init(runtime, type, class2type);
+
+ result |= types->get(ETCH_AUTH_EXCEPTION_TYPE_NAME(), type);
+ result |= EtchAuthenticationExceptionSerializer::Init(runtime, type, class2type);
{
- result = types->get(ETCH_EXCEPTION_MESSAGE_NAME(), type);
+ result |= types->get(ETCH_EXCEPTION_MESSAGE_NAME(), type);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorRuntimeException::Get(val);
- result = type->putValidator(_mf_result(), val);
- EtchValidatorLong::Get(0, val);
- result = type->putValidator(_mf__messageId(), val);
- result = type->putValidator(_mf__inReplyTo(), val);
+ EtchValidatorRuntimeException::Get(runtime, val);
+ result |= type->putValidator(_mf_result(), val);
+ EtchValidatorLong::Get(runtime, 0, val);
+ result |= type->putValidator(_mf__messageId(), val);
+ result |= type->putValidator(_mf__inReplyTo(), val);
}
- return ETCH_OK;
+ return result;
}
const EtchType * EtchDefaultValueFactory::get_mt__Etch_RuntimeException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -27,10 +27,8 @@ const EtchString& EtchHashTableSerialize
return name;
}
-EtchHashTableSerializer::EtchHashTableSerializer(EtchType* type, EtchField& field)
-: mField(field), mType(type) {
- //TODO refactoring
- mRuntime = EtchRuntime::getRuntime();
+EtchHashTableSerializer::EtchHashTableSerializer(EtchRuntime* runtime, EtchType* type, EtchField& field)
+: mRuntime(runtime), mField(field), mType(type) {
}
EtchHashTableSerializer::~EtchHashTableSerializer() {
@@ -98,10 +96,7 @@ status_t EtchHashTableSerializer::import
return ETCH_OK;
}
-status_t EtchHashTableSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchHashTableSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type) {
status_t result;
EtchField field;
@@ -118,11 +113,11 @@ status_t EtchHashTableSerializer::Init(E
type->setComponentType(EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchHashTableSerializer(type, field));
+ type->setImportExportHelper(new EtchHashTableSerializer(runtime, type, field));
//get validator
capu::SmartPointer<EtchValidator> tmp;
- result = EtchValidatorObject::Get(1, tmp);
+ result = EtchValidatorObject::Get(runtime, 1, tmp);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -28,10 +28,8 @@ const EtchString& EtchListSerializer::FI
// TODO: check signature regarding by value copy
-EtchListSerializer::EtchListSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchListSerializer::EtchListSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
+: mRuntime(runtime), mField(*field), mType(type) {
}
EtchListSerializer::~EtchListSerializer() {
@@ -92,10 +90,7 @@ status_t EtchListSerializer::importValue
return ETCH_OK;
}
-status_t EtchListSerializer::Init(EtchType* type, EtchClass2TypeMap * class2type) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchListSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap * class2type) {
status_t result;
EtchField field;
@@ -113,11 +108,11 @@ status_t EtchListSerializer::Init(EtchTy
//set the import export helper
// TODO memory EtchField
- type->setImportExportHelper(new EtchListSerializer(type, &field));
-
+ type->setImportExportHelper(new EtchListSerializer(runtime, type, &field));
+
//get validator
capu::SmartPointer<EtchValidator> validator;
- result = EtchValidatorObject::Get(1, validator);
+ result = EtchValidatorObject::Get(runtime, 1, validator);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -28,10 +28,8 @@ const EtchString& EtchRuntimeExceptionSe
// TODO: check signature regarding by value copy
-EtchRuntimeExceptionSerializer::EtchRuntimeExceptionSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchRuntimeExceptionSerializer::EtchRuntimeExceptionSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
+: mRuntime(runtime), mField(*field), mType(type) {
}
EtchRuntimeExceptionSerializer::~EtchRuntimeExceptionSerializer() {
@@ -71,10 +69,7 @@ status_t EtchRuntimeExceptionSerializer:
return ETCH_OK;
}
-status_t EtchRuntimeExceptionSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchRuntimeExceptionSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type) {
status_t result;
EtchField field;
@@ -91,11 +86,11 @@ status_t EtchRuntimeExceptionSerializer:
type->setComponentType(EtchRuntimeException::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchRuntimeExceptionSerializer(type, &field));
+ type->setImportExportHelper(new EtchRuntimeExceptionSerializer(runtime, type, &field));
//get validator
capu::SmartPointer<EtchValidator> tmp;
- result = EtchValidatorString::Get(0, tmp);
+ result = EtchValidatorString::Get(runtime, 0, tmp);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp Wed Oct 17 06:50:01 2012
@@ -26,10 +26,8 @@ const EtchString& EtchSetSerializer::FIE
return name;
}
-EtchSetSerializer::EtchSetSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
- // TODO refactoring
- mRuntime = EtchRuntime::getRuntime();
+EtchSetSerializer::EtchSetSerializer(EtchRuntime* runtime, EtchType* type, EtchField* field)
+: mRuntime(runtime), mField(*field), mType(type) {
}
EtchSetSerializer::~EtchSetSerializer() {
@@ -89,10 +87,7 @@ status_t EtchSetSerializer::importValue(
return ETCH_OK;
}
-status_t EtchSetSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
- //TODO refactoring
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchSetSerializer::Init(EtchRuntime* runtime, EtchType* type, EtchClass2TypeMap* class2type) {
status_t result;
EtchField field;
@@ -109,11 +104,11 @@ status_t EtchSetSerializer::Init(EtchTyp
type->setComponentType(EtchHashSet<capu::SmartPointer<EtchObject> >::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchSetSerializer(type, &field));
+ type->setImportExportHelper(new EtchSetSerializer(runtime, type, &field));
//get validator
capu::SmartPointer<EtchValidator> tmp;
- result = EtchValidatorObject::Get(1, tmp);
+ result = EtchValidatorObject::Get(runtime, 1, tmp);
if (result != ETCH_OK) {
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorBoole
return &TYPE;
}
-EtchValidatorBoolean::EtchValidatorBoolean(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorBoolean::TYPE(), EtchBool::TYPE(), EtchBool::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorBoolean::EtchValidatorBoolean(EtchRuntime* runtime, capu::uint32_t ndim)
+: mRuntime(runtime), EtchTypeValidator(EtchValidatorBoolean::TYPE(), EtchBool::TYPE(), EtchBool::TYPE(), ndim) {
}
EtchValidatorBoolean::EtchValidatorBoolean(const EtchValidatorBoolean& other)
@@ -79,19 +77,16 @@ status_t EtchValidatorBoolean::validateV
}
}
-status_t EtchValidatorBoolean::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorBoolean::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorBoolean(ndim);
+ val = new EtchValidatorBoolean(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorBoolean(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorBoolean(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorBoolean has been created");
}
val = Validators(runtime)[ndim];
@@ -99,6 +94,6 @@ status_t EtchValidatorBoolean::Get(capu:
}
status_t EtchValidatorBoolean::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorBoolean::Get(mNDims - 1, val);
+ return EtchValidatorBoolean::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Wed Oct 17 06:50:01 2012
@@ -31,14 +31,12 @@ const EtchObjectType* EtchValidatorByte:
return &TYPE;
}
-EtchValidatorByte::EtchValidatorByte(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorByte::TYPE(), EtchByte::TYPE(), EtchByte::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorByte::EtchValidatorByte(EtchRuntime* runtime, capu::uint32_t ndim)
+: mRuntime(runtime), EtchTypeValidator(EtchValidatorByte::TYPE(), EtchByte::TYPE(), EtchByte::TYPE(), ndim) {
}
EtchValidatorByte::EtchValidatorByte(const EtchValidatorByte& other)
-: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+: mRuntime(other.mRuntime), EtchTypeValidator(other) {
}
@@ -123,19 +121,16 @@ status_t EtchValidatorByte::validateValu
}
}
-status_t EtchValidatorByte::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorByte::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorByte(ndim);
+ val = new EtchValidatorByte(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorByte(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorByte(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorByte", "EtchValidatorByte has been created");
}
@@ -144,5 +139,5 @@ status_t EtchValidatorByte::Get(capu::ui
}
status_t EtchValidatorByte::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorByte::Get(mNDims - 1, val);
+ return EtchValidatorByte::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp Wed Oct 17 06:50:01 2012
@@ -116,14 +116,14 @@ const EtchObjectType* EtchValidatorCusto
return &TYPE;
}
-EtchValidatorCustom::EtchValidatorCustom(const EtchObjectType *type, capu::uint32_t ndim, capu::bool_t sub)
- : EtchTypeValidator(EtchValidatorCustom::TYPE(), type, type, ndim) {
+EtchValidatorCustom::EtchValidatorCustom(EtchRuntime* runtime, const EtchObjectType *type, capu::uint32_t ndim, capu::bool_t sub)
+ : EtchTypeValidator(EtchValidatorCustom::TYPE(), type, type, ndim), mRuntime(runtime) {
// TODO refacotor type hierarchy
mSubclass = sub;
}
EtchValidatorCustom::EtchValidatorCustom(const EtchValidatorCustom& other)
- : EtchTypeValidator(other) {
+ : EtchTypeValidator(other), mRuntime(other.mRuntime) {
}
@@ -155,24 +155,21 @@ status_t EtchValidatorCustom::validateVa
}
}
-status_t EtchValidatorCustom::Get(capu::uint32_t ndim, const EtchObjectType *type, capu::bool_t sub, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorCustom::Get(EtchRuntime* runtime, capu::uint32_t ndim, const EtchObjectType *type, capu::bool_t sub, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
EtchValidatorCustomKey key(type, ndim, sub);
if (Validators(runtime).get(key, &val) == ETCH_ENOT_EXIST) {
- val = new EtchValidatorCustom(type, ndim, sub);
+ val = new EtchValidatorCustom(runtime, type, ndim, sub);
Validators(runtime).put(key, val);
}
return ETCH_OK;
}
status_t EtchValidatorCustom::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorCustom::Get(mNDims - 1, mExpectedType->getObjectComponentType(), mSubclass, val);
+ return EtchValidatorCustom::Get(mRuntime, mNDims - 1, mExpectedType->getObjectComponentType(), mSubclass, val);
}
EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >& EtchValidatorCustom::Validators(EtchRuntime* runtime) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp Wed Oct 17 06:50:01 2012
@@ -30,10 +30,8 @@ const EtchObjectType* EtchValidatorDoubl
return &TYPE;
}
-EtchValidatorDouble::EtchValidatorDouble(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorDouble::TYPE(), EtchDouble::TYPE(), EtchDouble::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorDouble::EtchValidatorDouble(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorDouble::TYPE(), EtchDouble::TYPE(), EtchDouble::TYPE(), ndim), mRuntime(runtime) {
}
EtchValidatorDouble::EtchValidatorDouble(const EtchValidatorDouble& other)
@@ -78,19 +76,16 @@ status_t EtchValidatorDouble::validateVa
}
}
-status_t EtchValidatorDouble::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorDouble::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorDouble(ndim);
+ val = new EtchValidatorDouble(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorDouble(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorDouble(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorDouble has been created");
}
val = Validators(runtime)[ndim];
@@ -98,5 +93,5 @@ status_t EtchValidatorDouble::Get(capu::
}
status_t EtchValidatorDouble::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorDouble::Get(mNDims - 1, val);
+ return EtchValidatorDouble::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorFloat
return &TYPE;
}
-EtchValidatorFloat::EtchValidatorFloat(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorFloat::TYPE(), EtchFloat::TYPE(), EtchFloat::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorFloat::EtchValidatorFloat(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorFloat::TYPE(), EtchFloat::TYPE(), EtchFloat::TYPE(), ndim), mRuntime(runtime) {
}
EtchValidatorFloat::EtchValidatorFloat(const EtchValidatorFloat& other)
@@ -78,19 +76,16 @@ status_t EtchValidatorFloat::validateVal
}
}
-status_t EtchValidatorFloat::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorFloat::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorFloat(ndim);
+ val = new EtchValidatorFloat(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorFloat(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorFloat(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorFloat has been created");
}
val = Validators(runtime)[ndim];
@@ -98,5 +93,5 @@ status_t EtchValidatorFloat::Get(capu::u
}
status_t EtchValidatorFloat::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorFloat::Get(mNDims - 1, val);
+ return EtchValidatorFloat::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Wed Oct 17 06:50:01 2012
@@ -31,14 +31,12 @@ const EtchObjectType* EtchValidatorInt::
return &TYPE;
}
-EtchValidatorInt::EtchValidatorInt(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorInt::TYPE(), EtchInt32::TYPE(), EtchInt32::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorInt::EtchValidatorInt(EtchRuntime* runtime, capu::uint32_t ndim)
+: mRuntime(runtime), EtchTypeValidator(EtchValidatorInt::TYPE(), EtchInt32::TYPE(), EtchInt32::TYPE(), ndim) {
}
EtchValidatorInt::EtchValidatorInt(const EtchValidatorInt& other)
-: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+: mRuntime(other.mRuntime), EtchTypeValidator(other) {
}
@@ -115,19 +113,16 @@ status_t EtchValidatorInt::validateValue
}
}
-status_t EtchValidatorInt::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorInt::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorInt(ndim);
+ val = new EtchValidatorInt(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorInt(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorInt(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorInt has been created");
}
val = Validators(runtime)[ndim];
@@ -135,5 +130,5 @@ status_t EtchValidatorInt::Get(capu::uin
}
status_t EtchValidatorInt::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorInt::Get(mNDims - 1, val);
+ return EtchValidatorInt::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorLong:
return &TYPE;
}
-EtchValidatorLong::EtchValidatorLong(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorLong::TYPE(), EtchLong::TYPE(), EtchLong::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorLong::EtchValidatorLong(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorLong::TYPE(), EtchLong::TYPE(), EtchLong::TYPE(), ndim), mRuntime(runtime) {
}
EtchValidatorLong::EtchValidatorLong(const EtchValidatorLong& other)
@@ -109,19 +107,16 @@ status_t EtchValidatorLong::validateValu
}
}
-status_t EtchValidatorLong::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorLong::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorLong(ndim);
+ val = new EtchValidatorLong(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorLong(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorLong(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorLong has been created");
}
val = Validators(runtime)[ndim];
@@ -129,5 +124,5 @@ status_t EtchValidatorLong::Get(capu::ui
}
status_t EtchValidatorLong::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorLong::Get(mNDims - 1, val);
+ return EtchValidatorLong::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp Wed Oct 17 06:50:01 2012
@@ -29,10 +29,8 @@ const EtchObjectType* EtchValidatorNone:
return &TYPE;
}
-EtchValidatorNone::EtchValidatorNone()
-: EtchValidator(EtchValidatorNone::TYPE()) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorNone::EtchValidatorNone(EtchRuntime* runtime)
+: EtchValidator(EtchValidatorNone::TYPE()), mRuntime(runtime) {
}
EtchValidatorNone::EtchValidatorNone(const EtchValidatorNone& other)
@@ -58,12 +56,9 @@ status_t EtchValidatorNone::validateValu
}
}
-status_t EtchValidatorNone::Get(capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorNone::Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val) {
if (Validators(runtime)[0].get() == NULL) {
- Validators(runtime)[0] = new EtchValidatorNone();
+ Validators(runtime)[0] = new EtchValidatorNone(runtime);
CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorNone", "EtchValidatorNone has been created");
}
val = Validators(runtime)[0];
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp Wed Oct 17 06:50:01 2012
@@ -29,10 +29,8 @@ const EtchObjectType* EtchValidatorObjec
return &TYPE;
}
-EtchValidatorObject::EtchValidatorObject(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorObject::TYPE(), EtchObject::TYPE(), EtchObject::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorObject::EtchValidatorObject(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorObject::TYPE(), EtchObject::TYPE(), EtchObject::TYPE(), ndim), mRuntime(runtime) {
mSubclass = true;
}
@@ -65,25 +63,22 @@ status_t EtchValidatorObject::validateVa
}
}
-status_t EtchValidatorObject::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorObject::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS)
return ETCH_EINVAL;
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorObject(ndim);
+ val = new EtchValidatorObject(runtime, ndim);
return ETCH_OK;
}
//TODO thread safety
if (Validators(runtime)[ndim].get() == NULL) {
CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorObject", "EtchValidatorObject has been created");
- Validators(runtime)[ndim] = new EtchValidatorObject(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorObject(runtime, ndim);
}
val = Validators(runtime)[ndim];
return ETCH_OK;
}
status_t EtchValidatorObject::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorObject::Get(mNDims - 1, val);
+ return EtchValidatorObject::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorRunti
return &TYPE;
}
-EtchValidatorRuntimeException::EtchValidatorRuntimeException()
-: EtchValidator(EtchValidatorRuntimeException::TYPE()) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorRuntimeException::EtchValidatorRuntimeException(EtchRuntime* runtime)
+: EtchValidator(EtchValidatorRuntimeException::TYPE()), mRuntime(runtime) {
}
EtchValidatorRuntimeException::EtchValidatorRuntimeException(const EtchValidatorRuntimeException& other)
@@ -62,12 +60,9 @@ status_t EtchValidatorRuntimeException::
}
}
-status_t EtchValidatorRuntimeException::Get(capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorRuntimeException::Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val) {
if (Validators(runtime)[0].get() == NULL) {
- Validators(runtime)[0] = new EtchValidatorRuntimeException();
+ Validators(runtime)[0] = new EtchValidatorRuntimeException(runtime);
CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorRuntimeException", "EtchValidatorRuntimeException has been created");
}
val = Validators(runtime)[0];
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorShort
return &TYPE;
}
-EtchValidatorShort::EtchValidatorShort(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorShort::TYPE(), EtchShort::TYPE(), EtchShort::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorShort::EtchValidatorShort(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorShort::TYPE(), EtchShort::TYPE(), EtchShort::TYPE(), ndim), mRuntime(runtime) {
}
EtchValidatorShort::EtchValidatorShort(const EtchValidatorShort& other)
@@ -118,25 +116,22 @@ status_t EtchValidatorShort::validateVal
}
}
-status_t EtchValidatorShort::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorShort::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorShort(ndim);
+ val = new EtchValidatorShort(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorShort", "EtchValidatorShort has been created");
- Validators(runtime)[ndim] = new EtchValidatorShort(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorShort(runtime, ndim);
}
val = Validators(runtime)[ndim];
return ETCH_OK;
}
status_t EtchValidatorShort::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorShort::Get(mNDims - 1, val);
+ return EtchValidatorShort::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp Wed Oct 17 06:50:01 2012
@@ -31,10 +31,8 @@ const EtchObjectType* EtchValidatorStrin
return &TYPE;
}
-EtchValidatorString::EtchValidatorString(capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorString::TYPE(), EtchString::TYPE(), EtchString::TYPE(), ndim) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorString::EtchValidatorString(EtchRuntime* runtime, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorString::TYPE(), EtchString::TYPE(), EtchString::TYPE(), ndim), mRuntime(runtime) {
}
EtchValidatorString::EtchValidatorString(const EtchValidatorString& other)
@@ -76,19 +74,16 @@ status_t EtchValidatorString::validateVa
}
}
-status_t EtchValidatorString::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorString::Get(EtchRuntime* runtime, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
if (ndim >= MAX_CACHED) {
- val = new EtchValidatorString(ndim);
+ val = new EtchValidatorString(runtime, ndim);
return ETCH_OK;
}
if (Validators(runtime)[ndim].get() == NULL) {
- Validators(runtime)[ndim] = new EtchValidatorString(ndim);
+ Validators(runtime)[ndim] = new EtchValidatorString(runtime, ndim);
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorString has been created");
}
val = Validators(runtime)[ndim];
@@ -96,5 +91,5 @@ status_t EtchValidatorString::Get(capu::
}
status_t EtchValidatorString::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return EtchValidatorString::Get(mNDims - 1, val);
+ return EtchValidatorString::Get(mRuntime, mNDims - 1, val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp Wed Oct 17 06:50:01 2012
@@ -26,14 +26,13 @@ const EtchObjectType* EtchValidatorStruc
return &TYPE;
}
-EtchValidatorStructValue::EtchValidatorStructValue(EtchType* type, capu::uint32_t ndim)
-: EtchTypeValidator(EtchValidatorStructValue::TYPE(), EtchStructValue::TYPE(), EtchStructValue::TYPE(), ndim), mType(type) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchValidatorStructValue::EtchValidatorStructValue(EtchRuntime* runtime, EtchType* type, capu::uint32_t ndim)
+: EtchTypeValidator(EtchValidatorStructValue::TYPE(), EtchStructValue::TYPE(), EtchStructValue::TYPE(), ndim)
+, mRuntime(runtime), mType(type) {
}
EtchValidatorStructValue::EtchValidatorStructValue(const EtchValidatorStructValue& other)
-: EtchTypeValidator(other), mType(other.mType), mRuntime(other.mRuntime) {
+: EtchTypeValidator(other), mRuntime(other.mRuntime), mType(other.mType) {
}
@@ -73,18 +72,15 @@ capu::bool_t EtchValidatorStructValue::v
}
status_t EtchValidatorStructValue::getElementValidator(capu::SmartPointer<EtchValidator> &val) {
- return Get(mType, mNDims - 1, val);
+ return Get(mRuntime, mType, mNDims - 1, val);
}
-status_t EtchValidatorStructValue::Get(EtchType* type, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+status_t EtchValidatorStructValue::Get(EtchRuntime* runtime, EtchType* type, capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorShort has been created");
- val = capu::SmartPointer <EtchValidator > (new EtchValidatorStructValue(type, ndim));
+ val = capu::SmartPointer <EtchValidator > (new EtchValidatorStructValue(runtime, type, ndim));
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchDefaultServerFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchDefaultServerFactory.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchDefaultServerFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchDefaultServerFactory.cpp Wed Oct 17 06:50:01 2012
@@ -78,7 +78,7 @@ status_t EtchDefaultServerFactory::trans
if(mListener == NULL) {
return ETCH_ERANGE;
}
- return mListener->transportControl(control, value);;
+ return mListener->transportControl(control, value);
}
status_t EtchDefaultServerFactory::transportNotify( capu::SmartPointer<EtchObject> event ) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp Wed Oct 17 06:50:01 2012
@@ -24,10 +24,8 @@
static char* TAG = "EtchRemoteBase";
-EtchRemoteBase::EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack)
- : mSvc(svc), mVf(vf), mStack(stack) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchRemoteBase::EtchRemoteBase(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack)
+ : mRuntime(runtime), mSvc(svc), mVf(vf), mStack(stack) {
}
EtchRemoteBase::~EtchRemoteBase() {
@@ -51,7 +49,7 @@ status_t EtchRemoteBase::send(capu::Smar
}
status_t EtchRemoteBase::begincall(capu::SmartPointer<EtchMessage> msg, EtchMailbox *&result) {
- CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "Begin call for the message is initiated");
+ CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "Begin call for the message is initiated");
return mSvc->begincall(msg, result);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp Wed Oct 17 06:50:01 2012
@@ -21,21 +21,15 @@
#include "support/EtchTransportHelper.h"
#include "util/EtchLogger.h"
-//TODO remove this after refactoring
-EtchRuntime* EtchRuntime::sRuntime = NULL;
-
EtchRuntime::EtchRuntime()
- : mIsClosed(false)
- , mLogger(NULL) {
+ : mIsClosed(false) {
mMutex.lock();
mId = getNextId();
mMutex.unlock();
-
- //TODO remove this after refactoring
- sRuntime = this;
}
EtchRuntime::~EtchRuntime() {
+ //do nothing
}
capu::uint64_t EtchRuntime::getId() {
@@ -101,19 +95,6 @@ capu::uint64_t EtchRuntime::getNextId()
return sId++;
}
-status_t EtchRuntime::setLogger(EtchLogger* logger) {
- if(logger == NULL) {
- return ETCH_EINVAL;
- }
- mLogger = logger;
- return ETCH_OK;
-}
-
-EtchLogger* EtchRuntime::getLogger() {
+EtchLogger& EtchRuntime::getLogger() {
return mLogger;
}
-
-EtchRuntime* EtchRuntime::getRuntime() {
- return sRuntime;
-}
-
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp Wed Oct 17 06:50:01 2012
@@ -23,19 +23,19 @@ const EtchObjectType* EtchStackClient::T
return &TYPE;
}
-EtchStackClient::EtchStackClient() : EtchStack(), mStaticResources(NULL) {
+EtchStackClient::EtchStackClient(EtchRuntime* runtime) : EtchStack(), mRuntime(runtime), mStaticResources(NULL) {
addObjectType(EtchStackClient::TYPE());
}
EtchStackClient::EtchStackClient(const EtchStackClient& other)
- : EtchStack(other), mStaticResources(other.mStaticResources)
+ : EtchStack(other), mRuntime(other.mRuntime), mStaticResources(other.mStaticResources)
{
}
EtchStackClient::~EtchStackClient() {
if (mStaticResources != NULL) {
- EtchTransportHelper::DestroyResources(mStaticResources);
+ EtchTransportHelper::DestroyResources(mRuntime, mStaticResources);
}
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp Wed Oct 17 06:50:01 2012
@@ -42,16 +42,13 @@ const EtchString& EtchTransportHelper::X
return type;
}
-status_t EtchTransportHelper::InitResources(EtchResources* resources, EtchResources*& result) {
+status_t EtchTransportHelper::InitResources(EtchRuntime* runtime, EtchResources* resources, EtchResources*& result) {
if(resources == NULL) {
resources = new EtchResources();
} else {
resources = new EtchResources(*resources);
}
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
-
EtchObject* obj = NULL;
EtchObject* objOld = NULL;
// Queued Pool
@@ -72,16 +69,14 @@ status_t EtchTransportHelper::InitResour
return ETCH_OK;
}
-status_t EtchTransportHelper::DestroyResources(EtchResources* resources) {
- status_t result;
+status_t EtchTransportHelper::DestroyResources(EtchRuntime* runtime, EtchResources* resources) {
+ status_t result;
if (resources == NULL) {
return ETCH_EINVAL;
} else {
- //TODO rafactor this
- EtchRuntime* runtime = EtchRuntime::getRuntime();
EtchObject* returnValue = NULL;
-
+
//get queued pool and delete it
result = resources->get(EtchTransportHelper::QUEUED_POOL(), returnValue);
if(result == ETCH_OK && returnValue != NULL) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp Wed Oct 17 06:50:01 2012
@@ -29,20 +29,14 @@ const EtchString& EtchDefaultDeliverySer
return name;
}
-EtchDefaultDeliveryService::EtchDefaultDeliveryService(EtchMailboxManager* transport, const EtchString& uri)
+EtchDefaultDeliveryService::EtchDefaultDeliveryService(EtchRuntime* runtime, EtchMailboxManager* transport, const EtchString& uri)
: mTransport(transport), mStatus(EtchString("session status"), EtchString("")) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
-
EtchURL url(uri);
init(&url);
}
-EtchDefaultDeliveryService::EtchDefaultDeliveryService(EtchMailboxManager* transport, EtchURL* uri)
-: mTransport(transport), mStatus(EtchString("session status"), EtchString("")) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
-
+EtchDefaultDeliveryService::EtchDefaultDeliveryService(EtchRuntime* runtime, EtchMailboxManager* transport, EtchURL* uri)
+: mRuntime(runtime), mTransport(transport), mStatus(EtchString("session status"), EtchString("")) {
init(uri);
}
@@ -150,7 +144,7 @@ status_t EtchDefaultDeliveryService::tra
}
status_t EtchDefaultDeliveryService::begincall(capu::SmartPointer<EtchMessage> msg, EtchMailbox*& result) {
- CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "Begin call for the message has been initiated");
+ CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "Begin call for the message has been initiated");
return mTransport->transportCall(NULL, msg, result);
}
@@ -165,7 +159,7 @@ status_t EtchDefaultDeliveryService::end
status_t res = mb->read(mbe, timeout);
if (res != ETCH_OK) {
mb->closeRead();
- CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Error on mailbox read, might be caused by timeout");
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Error on mailbox read, might be caused by timeout");
//TODO: Add error handling
return res;
}
@@ -193,7 +187,7 @@ status_t EtchDefaultDeliveryService::end
} else if (err != ETCH_OK) {
mb->closeRead();
rmsg->clear();
- CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Error on getting respective field on message structure");
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Error on getting respective field on message structure");
delete mbe;
return ETCH_ERROR;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp Wed Oct 17 06:50:01 2012
@@ -26,10 +26,8 @@ const EtchString& EtchMessagizer::FORMAT
}
capu::Mutex EtchMessagizer::mutex;
-EtchMessagizer::EtchMessagizer(EtchTransportPacket* transport, EtchURL* uri, EtchResources* resources)
-: mTransport(transport) {
- //TODO refactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchMessagizer::EtchMessagizer(EtchRuntime* runtime, EtchTransportPacket* transport, EtchURL* uri, EtchResources* resources)
+: mRuntime(runtime), mTransport(transport) {
EtchString format;
EtchObject * val;
@@ -38,14 +36,14 @@ EtchMessagizer::EtchMessagizer(EtchTrans
if (uri->getTerms().get(FORMAT(), &format) == ETCH_OK) {
if (format.equals(&EtchFormat::BINARY())) {
- mTdi = new EtchBinaryTaggedDataInput((EtchValueFactory *) val);
- mTdo = new EtchBinaryTaggedDataOutput((EtchValueFactory *) val, uri);
+ mTdi = new EtchBinaryTaggedDataInput(runtime, (EtchValueFactory *) val);
+ mTdo = new EtchBinaryTaggedDataOutput(runtime, (EtchValueFactory *) val, uri);
} else if (format.equals(&EtchFormat::XML())) {
//we dont need serialization via xml currently
}
} else {
- mTdi = new EtchBinaryTaggedDataInput((EtchValueFactory *) val);
- mTdo = new EtchBinaryTaggedDataOutput((EtchValueFactory *) val, uri);
+ mTdi = new EtchBinaryTaggedDataInput(runtime, (EtchValueFactory *) val);
+ mTdo = new EtchBinaryTaggedDataOutput(runtime, (EtchValueFactory *) val, uri);
}
transport->setSession(this);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp Wed Oct 17 06:50:01 2012
@@ -41,11 +41,8 @@ const EtchString& EtchPacketizer::MAX_PK
return pktSize;
}
-EtchPacketizer::EtchPacketizer(EtchTransportData* transport, EtchString& uri)
-: mTransport(transport), mBodyLen(0), mWantHeader(true) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
-
+EtchPacketizer::EtchPacketizer(EtchRuntime* runtime, EtchTransportData* transport, EtchString& uri)
+: mRuntime(runtime), mTransport(transport), mBodyLen(0), mWantHeader(true) {
if (mTransport != NULL)
mTransport->setSession(this);
@@ -63,11 +60,8 @@ EtchPacketizer::EtchPacketizer(EtchTrans
mSavedBuf = new EtchFlexBuffer();
}
-EtchPacketizer::EtchPacketizer(EtchTransportData* transport, EtchURL* uri)
-: mTransport(transport), mBodyLen(0), mWantHeader(true) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
-
+EtchPacketizer::EtchPacketizer(EtchRuntime* runtime, EtchTransportData* transport, EtchURL* uri)
+: mRuntime(runtime), mTransport(transport), mBodyLen(0), mWantHeader(true) {
EtchString value("");
if (mTransport != NULL)
transport->setSession(this);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp Wed Oct 17 06:50:01 2012
@@ -19,10 +19,8 @@
#include "support/EtchRuntime.h"
#include "capu/os/Debug.h"
-EtchPlainMailboxManager::EtchPlainMailboxManager(EtchTransportMessage* transport, const EtchString& uri, EtchResources* resources)
-: mSession(NULL), mTransport(transport), mUp(false) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
+EtchPlainMailboxManager::EtchPlainMailboxManager(EtchRuntime* runtime, EtchTransportMessage* transport, const EtchString& uri, EtchResources* resources)
+: mRuntime(runtime), mSession(NULL), mTransport(transport), mUp(false) {
capu::Debug::Assert(mRuntime != NULL);
mTransport->setSession(this);
}
@@ -58,7 +56,7 @@ status_t EtchPlainMailboxManager::regist
mMutex.unlock();
return ETCH_EINVAL;
}
-
+
EtchMailbox* tmp = NULL;
if (mMailboxes.get(msgid, &tmp) != ETCH_ENOT_EXIST) {
mMutex.unlock();
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp Wed Oct 17 06:50:01 2012
@@ -48,11 +48,8 @@ const EtchString& EtchTcpListener::CONNE
return name;
}
-EtchTcpListener::EtchTcpListener(EtchURL *url)
-: mPort(url->getPort()) {
- //TODO rafactor this
- mRuntime = EtchRuntime::getRuntime();
-
+EtchTcpListener::EtchTcpListener(EtchRuntime* runtime, EtchURL *url)
+: mRuntime(runtime), mPort(url->getPort()) {
EtchString str;
if (url->getTerms().get(BACKLOG(), &str) != ETCH_OK) {
mBackLog = 0;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp Wed Oct 17 06:50:01 2012
@@ -69,10 +69,10 @@ status_t EtchTcpTransportFactory::newTra
}
stack->setTransportData(c);
- EtchTransportPacket* p = new EtchPacketizer(c, &u);
+ EtchTransportPacket* p = new EtchPacketizer(mRuntime, c, &u);
stack->setTransportPacket(p);
- EtchTransportMessage* m = new EtchMessagizer(p, &u, resources);
+ EtchTransportMessage* m = new EtchMessagizer(mRuntime, p, &u, resources);
stack->setTransportMessage(m);
//TODO: ADD FILTERS HERE
@@ -98,7 +98,7 @@ status_t EtchTcpTransportFactory::newLis
//TODO secure communication
return ETCH_EUNIMPL;
} else {
- l = new EtchTcpListener(&u);
+ l = new EtchTcpListener(mRuntime, &u);
}
result = new MySessionListener(mRuntime, this, l, uri, resources, mIsSecure);
@@ -128,7 +128,7 @@ EtchTcpTransportFactory::MySessionListen
delete mFactory;
}
if (mResources != NULL) {
- EtchTransportHelper::DestroyResources(mResources);
+ EtchTransportHelper::DestroyResources(mRuntime, mResources);
}
capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
@@ -168,7 +168,7 @@ status_t EtchTcpTransportFactory::MySess
status_t EtchTcpTransportFactory::MySessionListener::sessionNotify(capu::SmartPointer<EtchObject> event) {
if (event->equals(&EtchTcpListener::CONNECTION_CHECK())) {
- //go through the list of connection and check if the connection is still dead and we have to clean the stack up
+ //go through the list of connection and check if the connection is still dead and we have to clean the stack up
capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
while (it.hasNext()) {
EtchStack* stack = NULL;
@@ -190,7 +190,7 @@ status_t EtchTcpTransportFactory::MySess
}
return mSession->sessionNotify(event);
-
+
}
status_t EtchTcpTransportFactory::MySessionListener::sessionAccepted(EtchSocket* connection) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp Wed Oct 17 06:50:01 2012
@@ -21,13 +21,13 @@
#include "util/EtchCircularQueue.h"
EtchCircularQueue::EtchCircularQueue()
-: mSize(10), mItems(NULL), mClosed(false), mCount(0), mHead(0), mTail(0) {
+: mItems(NULL), mClosed(false), mCount(0), mSize(10), mHead(0), mTail(0) {
mItems = new EtchMailbox::EtchElement*[mSize];
capu::Memory::Set(mItems, 0, sizeof(EtchMailbox::EtchElement*) * mSize);
}
EtchCircularQueue::EtchCircularQueue(capu::uint32_t size)
-: mSize(size), mItems(NULL), mClosed(false), mCount(0), mHead(0), mTail(0) {
+: mItems(NULL), mClosed(false), mCount(0), mSize(size), mHead(0), mTail(0) {
mItems = new EtchMailbox::EtchElement*[mSize];
capu::Memory::Set(mItems, 0, sizeof(EtchMailbox::EtchElement*) * mSize);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp Wed Oct 17 06:50:01 2012
@@ -76,7 +76,7 @@ TEST(EtchArrayValueTest, getTest) {
capu::SmartPointer<EtchObject> result;
EtchArrayValue *av = new EtchArrayValue(array, 5);
- EXPECT_EQ(5, av->getSize());
+ EXPECT_EQ(5u, av->getSize());
capu::int32_t index = 0;
EXPECT_EQ(ETCH_OK, av->get(index++, result));
@@ -106,7 +106,7 @@ TEST(EtchArrayValueTest, getTest) {
EtchArrayValue *av2 = new EtchArrayValue(nativeTypeArray, 5);
- EXPECT_EQ(5, av2->getSize());
+ EXPECT_EQ(5u, av2->getSize());
index = 0;
capu::SmartPointer<EtchInt32> intResult;
@@ -150,7 +150,7 @@ TEST(EtchArrayValueTest, addTest) {
capu::SmartPointer<EtchObject> result;
EtchArrayValue *av = new EtchArrayValue(array, 5);
- EXPECT_EQ(5, av->getSize());
+ EXPECT_EQ(5u, av->getSize());
capu::int32_t index = 0;
EXPECT_EQ(ETCH_OK, av->get(index++, result));
@@ -173,10 +173,10 @@ TEST(EtchArrayValueTest, addTest) {
EXPECT_EQ(ETCH_OK, av->get(index++, result));
EXPECT_TRUE(result->equals(dt.get()));
//size should be doubled
- EXPECT_EQ(10, av->getSize());
+ EXPECT_EQ(10u, av->getSize());
av->add(NULL);
- EXPECT_EQ(10, av->getSize());
+ EXPECT_EQ(10u, av->getSize());
delete av;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp Wed Oct 17 06:50:01 2012
@@ -118,9 +118,9 @@ TEST(EtchNativeArrayTest, Constructor_Ar
EtchNativeArray<capu::int8_t> *na2 = new EtchNativeArray<capu::int8_t>(2, 1, (capu::int8_t*)nativeArray);
- EXPECT_EQ(1, na2->getDim());
+ EXPECT_EQ(1u, na2->getDim());
EXPECT_EQ(2, na2->getLength());
-
+
capu::int8_t nativeResult;
EXPECT_EQ(ETCH_OK, na2->get(0,&nativeResult));
EXPECT_EQ(1, nativeResult);
@@ -138,9 +138,9 @@ TEST(EtchNativeArrayTest, Constructor_Ar
EtchNativeArray<capu::int8_t> *na3 = new EtchNativeArray<capu::int8_t>(2, 2, (capu::int8_t*)nativeArray2);
- EXPECT_EQ(2, na3->getDim());
+ EXPECT_EQ(2u, na3->getDim());
EXPECT_EQ(2, na3->getLength());
-
+
EXPECT_EQ(ETCH_OK, na3->get(Pos(0,0),&nativeResult));
EXPECT_EQ(0, nativeResult);
EXPECT_EQ(ETCH_OK, na3->get(Pos(0,1),&nativeResult));
@@ -205,7 +205,7 @@ TEST(EtchNativeArrayTest, setGetArray) {
//data == NULL
ret = na->set(0,NULL,0,0,0,&elementsWritten);
EXPECT_EQ(ETCH_EINVAL, ret);
-
+
//data == NULL
ret = na->get(0,NULL,0,0,0,&elementsRead);
EXPECT_EQ(ETCH_EINVAL, ret);
@@ -230,7 +230,7 @@ TEST(EtchNativeArrayTest, setGetArray) {
ret = na->set(0, arr1, 6, 0, 6, &elementsWritten);
EXPECT_EQ(ret, ETCH_OK);
EXPECT_EQ(elementsWritten, 6);
-
+
na->get(0,&temp);
EXPECT_EQ(temp->get(), 1);
na->set(0, int2);
@@ -441,11 +441,11 @@ TEST(EtchNativeArrayTest, setSubarray) {
//fill main array
mainArray->set(Pos(0, 0, 0), int1);
mainArray->set(Pos(0, 0, 1), int2);
-
+
//fill sub array
subArray->set(Pos(0),int3);
subArray->set(Pos(0),int4);
-
+
//set sub array in data array, must return error
ret = mainArray->set(Pos(1, 0, 0), subArray);
EXPECT_EQ(ETCH_ERANGE, ret);
@@ -500,4 +500,4 @@ TEST(EtchNativeArrayTest, setSubarray) {
delete na;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchAuthenticationExceptionSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchAuthenticationExceptionSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchAuthenticationExceptionSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchAuthenticationExceptionSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -71,16 +71,11 @@ class EtchAuthenticationExceptionSeriali
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ TEST_F(EtchAuthenticationExceptionSerial
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result;
- EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
c2type->get(EtchAuthenticationException::TYPE(), &result);
//check the added type to class to type matching
@@ -109,7 +104,7 @@ TEST_F(EtchAuthenticationExceptionSerial
//check validator
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorString::Get(0, val);
+ EtchValidatorString::Get(mRuntime, 0, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -126,7 +121,7 @@ TEST_F(EtchAuthenticationExceptionSerial
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
//initialize the serializer
- EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
EXPECT_TRUE(test->exportValue(NULL, NULL, result) == ETCH_EINVAL);
@@ -165,7 +160,7 @@ TEST_F(EtchAuthenticationExceptionSerial
capu::SmartPointer<EtchObject> object = new EtchAuthenticationException(message);
EtchStructValue* structValue;
//initialize the serializer
- EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchAuthenticationExceptionSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//export values
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp Wed Oct 17 06:50:01 2012
@@ -88,8 +88,8 @@ public:
*/
public:
- MyValueFactory(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MyValueFactory(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -134,8 +134,8 @@ public:
return vals;
}
- static void test(capu::SmartPointer<EtchObject> x, capu::SmartPointer<EtchValidator> v, capu::bool_t stringTypeAndField) {
- MyValueFactory vf("tcp:");
+ static void test(EtchRuntime* runtime, capu::SmartPointer<EtchObject> x, capu::SmartPointer<EtchValidator> v, capu::bool_t stringTypeAndField) {
+ MyValueFactory vf(runtime, "tcp:");
EtchType *mt_foo = NULL;
EtchField mf_x("x");
EtchString foo("foo");
@@ -148,10 +148,10 @@ public:
capu::uint32_t length;
capu::int8_t * buffer;
//SERIALIZE DATA INTO FLEX BUFFER
- msg2bytes(msg, stringTypeAndField, length, buffer, vf);
+ msg2bytes(runtime, msg, stringTypeAndField, length, buffer, vf);
capu::SmartPointer<EtchMessage> msg2;
//DESERIALIZE DATA FROM FLEX BYTE ARRAY
- bytes2msg(buffer, length, msg2, vf);
+ bytes2msg(runtime, buffer, length, msg2, vf);
//TYPE CHECK
EXPECT_TRUE(msg2->isType(mt_foo));
EXPECT_TRUE(msg2->count() == 1);
@@ -191,13 +191,13 @@ public:
}
}
- static void msg2bytes(capu::SmartPointer<EtchMessage> msg, capu::bool_t stringTypeAndField, capu::uint32_t &size, capu::int8_t *&buffer, MyValueFactory &vf) {
+ static void msg2bytes(EtchRuntime* runtime, capu::SmartPointer<EtchMessage> msg, capu::bool_t stringTypeAndField, capu::uint32_t &size, capu::int8_t *&buffer, MyValueFactory &vf) {
capu::SmartPointer<EtchFlexBuffer> buf = new EtchFlexBuffer();
EtchURL u("none:");
// u.addTerm(EtchBinaryTaggedDataOutput::STRING_TYPE_AND_FIELD(), stringTypeAndField);
- EtchBinaryTaggedDataOutput btdo(vf.factory, &u);
+ EtchBinaryTaggedDataOutput btdo(runtime, vf.factory, &u);
EXPECT_TRUE(btdo.writeMessage(msg, buf) == ETCH_OK);
buf->setIndex(0);
size = buf->getAvailableBytes();
@@ -207,23 +207,23 @@ public:
return;
}
- static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, MyValueFactory &vf) {
- bytes2msg(buf, length, msg, LEVEL_FULL, vf);
+ static void bytes2msg(EtchRuntime* runtime, capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, MyValueFactory &vf) {
+ bytes2msg(runtime, buf, length, msg, LEVEL_FULL, vf);
}
- static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, EtchLevel level, MyValueFactory &vf) {
+ static void bytes2msg(EtchRuntime* runtime, capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, EtchLevel level, MyValueFactory &vf) {
EtchLevel oldLevel = vf.factory->setLevel(level);
- EtchBinaryTaggedDataInput btdi(vf.factory);
+ EtchBinaryTaggedDataInput btdi(runtime, vf.factory);
capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer(buf, length);
buffer->setIndex(0);
EXPECT_TRUE(btdi.readMessage(buffer, msg) == ETCH_OK);
vf.factory->setLevel(oldLevel);
}
- static void test_bto_write(capu::SmartPointer<EtchObject> x, capu::int8_t *compare_buffer, capu::SmartPointer<EtchValidator> v) {
+ static void test_bto_write(EtchRuntime* runtime, capu::SmartPointer<EtchObject> x, capu::int8_t *compare_buffer, capu::SmartPointer<EtchValidator> v) {
EtchString type("a");
EtchString field("b");
- MyValueFactory vf("tcp:");
+ MyValueFactory vf(runtime, "tcp:");
EtchType t(1, type);
EtchField f(2, field);
@@ -232,7 +232,7 @@ public:
capu::SmartPointer<EtchMessage> msg = new EtchMessage(&t, vf.factory);
msg->put(f, x);
EtchURL u("none:");
- EtchBinaryTaggedDataOutput btdo(vf.factory, &u);
+ EtchBinaryTaggedDataOutput btdo(runtime, vf.factory, &u);
capu::SmartPointer<EtchFlexBuffer> buf = new EtchFlexBuffer();
buf->setByteRepresentation(ETCH_BIG_ENDIAN);
EXPECT_TRUE(btdo.writeMessage(msg, buf) == ETCH_OK);
@@ -253,16 +253,11 @@ class EtchBinaryTaggedDataInputOutputTes
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -272,14 +267,14 @@ protected:
TEST_F(EtchBinaryTaggedDataInputOutputTest, createTest) {
MockValueFactory9 *factory = new MockValueFactory9();
- EtchBinaryTaggedDataInput* dataIn = new EtchBinaryTaggedDataInput(factory);
+ EtchBinaryTaggedDataInput* dataIn = new EtchBinaryTaggedDataInput(mRuntime, factory);
delete dataIn;
delete factory;
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, checkTest) {
MockValueFactory9 *factory = new MockValueFactory9();
- EtchBinaryTaggedDataInput* dataIn = new EtchBinaryTaggedDataInput(factory);
+ EtchBinaryTaggedDataInput* dataIn = new EtchBinaryTaggedDataInput(mRuntime, factory);
// i'm testing with hard coded constants on the left hand
// side here because this represents our external interface
@@ -421,13 +416,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorBoolean::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorBoolean::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorBoolean::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorBoolean::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
//
@@ -445,13 +440,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorInt::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorInt::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorInt::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorInt::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, string_serialization) {
@@ -470,13 +465,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorString::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorString::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorString::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorString::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, long_serialization) {
@@ -493,13 +488,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorLong::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorLong::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorLong::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, byte_serialization) {
@@ -507,8 +502,8 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
capu::SmartPointer<EtchByte> content1 = new EtchByte(90);
//array can not be tested because it is optimized as native
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorByte::Get(0, val);
- Utility::test(content1, val, false);
+ EtchValidatorByte::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, short_serialization) {
@@ -525,13 +520,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorShort::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorShort::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorShort::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorShort::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, float_serialization) {
@@ -548,13 +543,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorFloat::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorFloat::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorFloat::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorFloat::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, double_serialization) {
@@ -571,20 +566,20 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorDouble::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorDouble::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorDouble::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorDouble::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, empty_string_serialization) {
capu::SmartPointer<EtchString> str = new EtchString(NULL, 0, "utf-8");
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorString::Get(0, val);
- Utility::test(str, val, false);
+ EtchValidatorString::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, str, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, date_serialization) {
@@ -605,13 +600,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorObject::Get(2, val);
- Utility::test(carray1, val, false);
- EtchValidatorObject::Get(0, val);
- Utility::test(content1, val, false);
- Utility::test(content2, val, false);
- Utility::test(content3, val, false);
- Utility::test(content4, val, false);
+ EtchValidatorObject::Get(mRuntime, 2, val);
+ Utility::test(mRuntime, carray1, val, false);
+ EtchValidatorObject::Get(mRuntime, 0, val);
+ Utility::test(mRuntime, content1, val, false);
+ Utility::test(mRuntime, content2, val, false);
+ Utility::test(mRuntime, content3, val, false);
+ Utility::test(mRuntime, content4, val, false);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_object_serialization) {
@@ -624,8 +619,8 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(1, content2);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorObject::Get(1, val);
- Utility::test_bto_write(carray1, byte_array, val);
+ EtchValidatorObject::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray1, byte_array, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_boolean_write) {
@@ -639,11 +634,11 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(0, content1);
carray->set(1, content2);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorBoolean::Get(0, val);
- Utility::test_bto_write(content2, byte_false, val);
- Utility::test_bto_write(content1, byte_true, val);
- EtchValidatorBoolean::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorBoolean::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content2, byte_false, val);
+ Utility::test_bto_write(mRuntime, content1, byte_true, val);
+ EtchValidatorBoolean::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
@@ -668,14 +663,14 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content5);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorByte::Get(0, val);
- Utility::test_bto_write(content1, byte_pos, val);
- Utility::test_bto_write(content2, byte_neg, val);
- Utility::test_bto_write(content0, byte_zero, val);
- Utility::test_bto_write(content7, bytes, val);
+ EtchValidatorByte::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content1, byte_pos, val);
+ Utility::test_bto_write(mRuntime, content2, byte_neg, val);
+ Utility::test_bto_write(mRuntime, content0, byte_zero, val);
+ Utility::test_bto_write(mRuntime, content7, bytes, val);
- EtchValidatorByte::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorByte::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
@@ -695,12 +690,12 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content3);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorShort::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
- Utility::test_bto_write(content7, byte_neg, val);
+ EtchValidatorShort::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
+ Utility::test_bto_write(mRuntime, content7, byte_neg, val);
- EtchValidatorShort::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorShort::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
@@ -720,12 +715,12 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content3);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorInt::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
- Utility::test_bto_write(content7, byte_neg, val);
+ EtchValidatorInt::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
+ Utility::test_bto_write(mRuntime, content7, byte_neg, val);
- EtchValidatorInt::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorInt::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_long_write) {
@@ -744,12 +739,12 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content3);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
- Utility::test_bto_write(content7, byte_neg, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
+ Utility::test_bto_write(mRuntime, content7, byte_neg, val);
- EtchValidatorLong::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorLong::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_float_write) {
@@ -765,11 +760,11 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content3);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorFloat::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
+ EtchValidatorFloat::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
- EtchValidatorFloat::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorFloat::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_double_write) {
@@ -785,19 +780,19 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(2, content3);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorDouble::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
+ EtchValidatorDouble::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
- EtchValidatorDouble::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorDouble::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_empty_string_write) {
capu::int8_t byte_pos[] = {3, 1, 1, 2, -110, -127};
capu::SmartPointer<EtchString> content0 = new EtchString("");
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorString::Get(0, val);
- Utility::test_bto_write(content0, byte_pos, val);
+ EtchValidatorString::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, content0, byte_pos, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_date_write) {
@@ -814,18 +809,18 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray->set(1, content2);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorObject::Get(1, val);
- Utility::test_bto_write(carray, byte_array, val);
+ EtchValidatorObject::Get(mRuntime, 1, val);
+ Utility::test_bto_write(mRuntime, carray, byte_array, val);
- EtchValidatorObject::Get(0, val);
- Utility::test_bto_write(date, byte_pos, val);
+ EtchValidatorObject::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, date, byte_pos, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, null_write) {
capu::int8_t byte_pos[] = {3, 1, 0, -127};
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorObject::Get(0, val);
- Utility::test_bto_write(NULL, byte_pos, val);
+ EtchValidatorObject::Get(mRuntime, 0, val);
+ Utility::test_bto_write(mRuntime, NULL, byte_pos, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, multi_dimension_test) {
@@ -842,8 +837,8 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 0), content3);
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorBoolean::Get(2, val);
- Utility::test_bto_write(carray1, byte_pos, val);
+ EtchValidatorBoolean::Get(mRuntime, 2, val);
+ Utility::test_bto_write(mRuntime, carray1, byte_pos, val);
}
TEST_F(EtchBinaryTaggedDataInputOutputTest, btdo_multi_array_write) {
@@ -860,6 +855,6 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
carray1->set(Pos(1, 0), content3);
carray1->set(Pos(1, 1), content4);
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorObject::Get(2, val);
- Utility::test_bto_write(carray1, byte_array ,val);
+ EtchValidatorObject::Get(mRuntime, 2, val);
+ Utility::test_bto_write(mRuntime, carray1, byte_array ,val);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp Wed Oct 17 06:50:01 2012
@@ -25,16 +25,11 @@ class EtchComboValidatorTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -46,8 +41,8 @@ TEST_F(EtchComboValidatorTest, createTes
capu::SmartPointer<EtchValidator> ptr;
capu::SmartPointer<EtchValidator> ptr2;
- EtchValidatorString::Get(0, ptr);
- EtchValidatorInt::Get(0, ptr2);
+ EtchValidatorString::Get(mRuntime, 0, ptr);
+ EtchValidatorInt::Get(mRuntime, 0, ptr2);
EtchComboValidator *combo = new EtchComboValidator(ptr, ptr2);
EXPECT_TRUE(combo != NULL);
@@ -87,8 +82,8 @@ TEST_F(EtchComboValidatorTest, validateT
EtchComboValidator *ptr = NULL;
capu::SmartPointer<EtchValidator> ptr1;
capu::SmartPointer<EtchValidator> ptr2;
- EtchValidatorInt::Get(0, ptr1);
- EtchValidatorString::Get(0, ptr2);
+ EtchValidatorInt::Get(mRuntime, 0, ptr1);
+ EtchValidatorString::Get(mRuntime, 0, ptr2);
ptr = new EtchComboValidator(ptr1, ptr2);
EXPECT_FALSE(ptr->validate(byte));
@@ -127,8 +122,8 @@ TEST_F(EtchComboValidatorTest, validateV
EtchComboValidator *ptr = NULL;
capu::SmartPointer<EtchValidator> ptr1;
capu::SmartPointer<EtchValidator> ptr2;
- EtchValidatorInt::Get(0, ptr1);
- EtchValidatorString::Get(0, ptr2);
+ EtchValidatorInt::Get(mRuntime, 0, ptr1);
+ EtchValidatorString::Get(mRuntime, 0, ptr2);
ptr = new EtchComboValidator(ptr1, ptr2);
//INT TESTS
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
@@ -154,8 +149,8 @@ TEST_F(EtchComboValidatorTest, elementVa
EtchComboValidator *ptr = NULL;
capu::SmartPointer<EtchValidator> ptr1;
capu::SmartPointer<EtchValidator> ptr2;
- EtchValidatorInt::Get(1, ptr1);
- EtchValidatorString::Get(1, ptr2);
+ EtchValidatorInt::Get(mRuntime, 1, ptr1);
+ EtchValidatorString::Get(mRuntime, 1, ptr2);
ptr = new EtchComboValidator(ptr1, ptr2);
capu::SmartPointer<EtchValidator> element_validator;
ptr->getElementValidator(element_validator);
@@ -207,4 +202,4 @@ TEST_F(EtchComboValidatorTest, elementVa
EXPECT_FALSE(element_validator->validate(str));
EXPECT_TRUE(element_validator->validate(str2));
delete ptr;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDateSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDateSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDateSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDateSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -71,16 +71,11 @@ class EtchDateSerializationTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ TEST_F(EtchDateSerializationTest, initTe
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result;
- EXPECT_TRUE(EtchDateSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchDateSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
c2type->get(EtchDate::TYPE(), &result);
//check the added type to class to type matching
@@ -109,7 +104,7 @@ TEST_F(EtchDateSerializationTest, initTe
//check validator
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -125,7 +120,7 @@ TEST_F(EtchDateSerializationTest, export
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
//initialize the serializer
- EXPECT_TRUE(EtchDateSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchDateSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
EtchImportExportHelper* test = type->getImportExportHelper();
//some test values
(capu::smartpointer_cast<EtchDate > (object))->set(5);
@@ -166,7 +161,7 @@ TEST_F(EtchDateSerializationTest, import
capu::SmartPointer<EtchObject> object = new EtchDate();
EtchStructValue* structValue;
//initialize the serializer
- EXPECT_TRUE(EtchDateSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchDateSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//some test values
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp Wed Oct 17 06:50:01 2012
@@ -26,16 +26,11 @@ class EtchDefaultValueFactoryTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -56,7 +51,7 @@ TEST_F(EtchDefaultValueFactoryTest, crea
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -86,7 +81,7 @@ TEST_F(EtchDefaultValueFactoryTest, type
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -169,7 +164,7 @@ TEST_F(EtchDefaultValueFactoryTest, expo
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -188,7 +183,7 @@ TEST_F(EtchDefaultValueFactoryTest, expo
EtchString strRuntime = "_Etch_RuntimeException";
test->getType(strRuntime, type);
EXPECT_TRUE(sv->isType(type));
- EXPECT_EQ(1, sv->count());
+ EXPECT_EQ(1u, sv->count());
EXPECT_EQ(ETCH_OK, sv->get(EtchDefaultValueFactory::_mf_msg(), &serialized));
EXPECT_TRUE(serialized->equals(&str));
@@ -221,7 +216,7 @@ TEST_F(EtchDefaultValueFactoryTest, impo
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -276,7 +271,7 @@ TEST_F(EtchDefaultValueFactoryTest, lock
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -319,7 +314,7 @@ TEST_F(EtchDefaultValueFactoryTest, mess
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -331,7 +326,7 @@ TEST_F(EtchDefaultValueFactoryTest, mess
EtchType *mt_foo = new EtchType(str);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
mt_foo->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
EtchMessage *msg = new EtchMessage(mt_foo, test);
@@ -369,7 +364,7 @@ TEST_F(EtchDefaultValueFactoryTest, inRe
types->get(str, _mt_x);
str.set("y");
types->get(str, _mt_y);
- EtchDefaultValueFactory::Init(types, class2type);
+ EtchDefaultValueFactory::Init(mRuntime, types, class2type);
types->lock();
class2type->lock();
@@ -381,7 +376,7 @@ TEST_F(EtchDefaultValueFactoryTest, inRe
EtchType *mt_foo = new EtchType(str);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
mt_foo->putValidator(EtchDefaultValueFactory::_mf__inReplyTo(), val);
EtchMessage *msg = new EtchMessage(mt_foo, test);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -71,16 +71,11 @@ class EtchHashTableSerializerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ TEST_F(EtchHashTableSerializerTest, init
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result = 0;
- EXPECT_TRUE(EtchHashTableSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchHashTableSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
c2type->get(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), &result);
//check the added type to class to type matching
@@ -108,7 +103,7 @@ TEST_F(EtchHashTableSerializerTest, init
type->getField(typeName, &field);
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorObject::Get(1, val);
+ EtchValidatorObject::Get(mRuntime, 1, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -125,7 +120,7 @@ TEST_F(EtchHashTableSerializerTest, expo
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
// //initialize the serializer
- EXPECT_TRUE(EtchHashTableSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchHashTableSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
EtchImportExportHelper* test = type->getImportExportHelper();
// //check with invalid values
EXPECT_TRUE(test->exportValue(NULL, NULL, result) == ETCH_EINVAL);
@@ -176,7 +171,7 @@ TEST_F(EtchHashTableSerializerTest, impo
capu::SmartPointer<EtchObject> object2_value = new EtchInt32(91);
EtchStructValue* structValue;
//initialize the serializer
- EXPECT_TRUE(EtchHashTableSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchHashTableSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//add some test entries
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchListSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchListSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchListSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchListSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -72,16 +72,11 @@ class EtchListSerializerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -94,7 +89,7 @@ TEST_F(EtchListSerializerTest, initTest)
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result;
- EXPECT_TRUE(EtchListSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchListSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
c2type->get(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), &result);
//check the added type to class to type matching
@@ -110,7 +105,7 @@ TEST_F(EtchListSerializerTest, initTest)
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorObject::Get(1, val);
+ EtchValidatorObject::Get(mRuntime, 1, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -126,7 +121,7 @@ TEST_F(EtchListSerializerTest, exportTes
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
//initialize the serializer
- EXPECT_TRUE(EtchListSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchListSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
EXPECT_TRUE(test->exportValue(NULL, NULL, result) == ETCH_EINVAL);
@@ -173,7 +168,7 @@ TEST_F(EtchListSerializerTest, importTes
capu::SmartPointer<EtchObject> object2 = NULL;
EtchStructValue* structValue;
//initialize the serializer
- EXPECT_TRUE(EtchListSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchListSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchRuntimeExceptionSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchRuntimeExceptionSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchRuntimeExceptionSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchRuntimeExceptionSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -73,16 +73,11 @@ class EtchRuntimeExceptionSerializationT
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -95,7 +90,7 @@ TEST_F(EtchRuntimeExceptionSerialization
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result;
- EtchRuntimeExceptionSerializer::Init(type, c2type);
+ EtchRuntimeExceptionSerializer::Init(mRuntime, type, c2type);
c2type->get(EtchRuntimeException::TYPE(), &result);
//check the added type to class to type matching
@@ -111,7 +106,7 @@ TEST_F(EtchRuntimeExceptionSerialization
//check validator
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorString::Get(0, val);
+ EtchValidatorString::Get(mRuntime, 0, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -128,7 +123,7 @@ TEST_F(EtchRuntimeExceptionSerialization
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
//initialize the serializer
- EtchRuntimeExceptionSerializer::Init(type, c2type);
+ EtchRuntimeExceptionSerializer::Init(mRuntime, type, c2type);
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
EXPECT_TRUE(test->exportValue(NULL, NULL, result) == ETCH_EINVAL);
@@ -167,7 +162,7 @@ TEST_F(EtchRuntimeExceptionSerialization
capu::SmartPointer<EtchObject> object = new EtchRuntimeException(message, ETCH_ERROR);
EtchStructValue* structValue;
//initialize the serializer
- EtchRuntimeExceptionSerializer::Init(type, c2type);
+ EtchRuntimeExceptionSerializer::Init(mRuntime, type, c2type);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//export values
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchSetSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchSetSerializerTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchSetSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchSetSerializerTest.cpp Wed Oct 17 06:50:01 2012
@@ -71,16 +71,11 @@ class EtchSetSerializerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ TEST_F(EtchSetSerializerTest, initTest)
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
EtchType* result;
- EXPECT_TRUE(EtchSetSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchSetSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
c2type->get(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), &result);
//check the added type to class to type matching
@@ -108,7 +103,7 @@ TEST_F(EtchSetSerializerTest, initTest)
type->getField(typeName, &field);
type->getValidator(field, validator);
capu::SmartPointer<EtchValidator> val;
- EtchValidatorObject::Get(1, val);
+ EtchValidatorObject::Get(mRuntime, 1, val);
EXPECT_TRUE(validator == val);
delete type;
delete c2type;
@@ -124,7 +119,7 @@ TEST_F(EtchSetSerializerTest, exportTest
capu::SmartPointer<EtchObject> object3;
EtchStructValue* result;
//initialize the serializer
- EXPECT_TRUE(EtchSetSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchSetSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
EXPECT_TRUE(test->exportValue(NULL, NULL, result) == ETCH_EINVAL);
@@ -170,7 +165,7 @@ TEST_F(EtchSetSerializerTest, importTest
capu::SmartPointer<EtchObject> object2;
EtchStructValue* structValue;
//initialize the serializer
- EXPECT_TRUE(EtchSetSerializer::Init(type, c2type) == ETCH_OK);
+ EXPECT_TRUE(EtchSetSerializer::Init(mRuntime, type, c2type) == ETCH_OK);
//get the serializer
EtchImportExportHelper* test = type->getImportExportHelper();
//check with invalid values
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp Wed Oct 17 06:50:01 2012
@@ -161,16 +161,11 @@ class EtchStructValueTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -189,8 +184,8 @@ TEST_F(EtchStructValueTest, createTest)
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -216,8 +211,8 @@ TEST_F(EtchStructValueTest, getTypeTest)
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -242,8 +237,8 @@ TEST_F(EtchStructValueTest, isType) {
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -278,8 +273,8 @@ TEST_F(EtchStructValueTest, putTest_FULL
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -328,8 +323,8 @@ TEST_F(EtchStructValueTest, putTest_MISS
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -378,8 +373,8 @@ TEST_F(EtchStructValueTest, putTest_NONE
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -422,8 +417,8 @@ TEST_F(EtchStructValueTest, getTest) {
capu::SmartPointer<EtchValidator> v1;
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorBoolean::Get(0, v1);
- EtchValidatorBoolean::Get(0, v2);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v2);
comp->putValidator(field1, v1);
comp->putValidator(field2, v2);
@@ -462,7 +457,7 @@ TEST_F(EtchStructValueTest, removeTest)
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> v1;
- EtchValidatorBoolean::Get(0, v1);
+ EtchValidatorBoolean::Get(mRuntime, 0, v1);
comp->putValidator(field1, v1);
EtchStructValue *sv = new EtchStructValue(comp, factory);
Author: veithm
Date: Wed Oct 17 06:49:27 2012
New Revision: 1399113
URL: http://svn.apache.org/viewvc?rev=1399113&view=rev
Log:
ETCH-243 Fixed bug in void function calls
Changed Connection Checker in order to avoid Race Condition
Enabling recreation of runtime if it has been destroyed before
Change-Id: Ia7d16052af22a5f7a4dfa2ee0708506222add095
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
Wed Oct 17 06:49:27 2012
@@ -55,14 +55,21 @@ status_t $clname::$n.name()AsyncResultRe
// TODO set result to a runtime exception
return ETCH_OK;
}
- if(result->isInstanceOf(EtchException::TYPE())) {
- setException(result);
- }
+
+ //result is NULL if it was a void call and no exception has been set
+ if (result.get() != NULL) {
+ if(result->isInstanceOf(EtchException::TYPE())) {
+ setException(result);
+ }
#if($n.hasReturn())
- else {
- setResult(result);
- }
+ else {
+ setResult(result);
+ }
#end
+ } else {
+ setMailboxStatus();
+ }
+
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
Wed Oct 17 06:49:27 2012
@@ -46,10 +46,6 @@ status_t $vf::Etch${intf.name()}RuntimeL
//the runtime is closed and is removed
$vf::SRuntimes.removeAt(index);
}
- if ($vf::SRuntimes.isEmpty()) {
- //clean up all static members
- $vf::DestroyValueFactory();
- }
return ETCH_OK;
}
@@ -148,13 +144,13 @@ class ImportExportHelper$n.vname( $helpe
//Static Variable Initialization
EtchTypeMap* $vf::types() {
-static EtchTypeMap* ret = new EtchTypeMap();
-return ret;
+static EtchTypeMap ret;
+return &ret;
}
EtchClass2TypeMap* $vf::class2type() {
-static EtchClass2TypeMap* ret = new EtchClass2TypeMap();
-return ret;
+static EtchClass2TypeMap ret;
+return &ret;
}
#foreach ( $n in $intf.iterator() )
@@ -399,12 +395,4 @@ status_t $vf::InitValueFactory(EtchRunti
class2type()->lock();
return ETCH_OK;
-}
-
-status_t $vf::DestroyValueFactory()
-{
- $vf::types()->clear();
- delete $vf::types();
- delete $vf::class2type();
- return ETCH_OK;
}
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
Wed Oct 17 06:49:27 2012
@@ -105,15 +105,13 @@ namespace $namespace {
*/
status_t onRuntimeChanged(EtchRuntime* runtime);
};
-
+
friend class ${i}Helper;
friend class Etch${i}RuntimeListener;
static status_t InitValueFactory(EtchRuntime* runtime);
- static status_t DestroyValueFactory();
static capu::Mutex SRuntimesMutex;
static capu::List<capu::uint64_t> SRuntimes;
static Etch${i}RuntimeListener S${i}RuntimeListener;
-
};
}
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h Wed Oct 17
06:49:27 2012
@@ -50,8 +50,6 @@ public:
capu::bool_t hasResult() {
mMutex.lock();
while(!mHasMailboxStatus) {
- // TODO wait
- break;
mCond.wait(&mMutex);
}
mMutex.unlock();
@@ -64,11 +62,8 @@ public:
status_t setResult(capu::SmartPointer<T> result) {
mResult = result;
mHasResult = true;
-
- mMutex.lock();
- mHasMailboxStatus = true;
- mCond.signal();
- mMutex.unlock();
+
+ setMailboxStatus();
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h Wed Oct
17 06:49:27 2012
@@ -65,6 +65,11 @@ public:
virtual status_t mailboxStatus(EtchMailbox* mb, EtchObject* state, capu::bool_t closed)
{return ETCH_OK;};
protected:
+ /**
+ * Sets the mailbox status to true and signals waiting threads
+ */
+ void setMailboxStatus();
+
EtchRuntime* mRuntime;
EtchMailbox* mMailbox;
capu::Mutex mMutex;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h Wed Oct 17 06:49:27
2012
@@ -149,20 +149,30 @@ status_t EtchStubBase<T>::sessionMessage
switch (type->getAsyncMode()) {
case QUEUED:
runnable = new EtchStubPoolRunnable<T>(this, sender, msg, helper);
+ //TODO: inject runtime and enable logging
+ //CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchStubBase", "Adding stub pool runnable
to queued pool");
res = mQueuedPool->add(runnable);
- if (res != ETCH_OK)
+ if (res != ETCH_OK) {
+ //CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchStubBase", "Error while adding runnable
to pool");
sessionNotify(NULL); //TODO Exception Handling
+ }
return res;
case FREE:
runnable = new EtchStubPoolRunnable<T>(this, sender, msg, helper);
+ //CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchStubBase", "Adding stub pool runnable
to free pool");
res = mFreePool->add(runnable);
- if (res != ETCH_OK)
+ if (res != ETCH_OK) {
+ //CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchStubBase", "Error while adding runnable
to pool");
sessionNotify(NULL); //TODO Exception Handling
+ }
return res;
case NONE:
+ //CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchStubBase", "Executing function in receiver
thread");
res = helper->run(this, mSvc, mObj, sender, msg);
- if (res != ETCH_OK)
+ if (res != ETCH_OK) {
+ //CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchStubBase", "Error while executing
function");
sessionNotify(NULL); //TODO Exception Handling
+ }
return res;
default:
// throw new IllegalArgumentException("unknown async mode "+type.getAsyncMode());
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h Wed Oct 17
06:49:27 2012
@@ -65,6 +65,13 @@ public:
virtual capu::bool_t isStarted() = 0;
/**
+ * Check whether the receiving thread is terminated or not
+ * @return true if it is terminated
+ * false otherwise
+ */
+ virtual capu::bool_t isTerminated() = 0;
+
+ /**
* Main function that will be executed by thread
* @param param parameter that will be passed to the thread
*/
@@ -125,6 +132,7 @@ protected:
S *mSession;
capu::Thread *mThread;
capu::bool_t mIsStarted;
+ capu::bool_t mIsTerminated;
static capu::Mutex mMutex;
static capu::Mutex mMutexConnection;
EtchMonitor mStatus;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h Wed Oct
17 06:49:27 2012
@@ -92,6 +92,11 @@ public:
* @see EtchConnection
*/
capu::bool_t isStarted();
+
+ /**
+ * @see EtchConnection
+ */
+ capu::bool_t isTerminated();
/**
* @see capu::thread
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h Wed Oct 17
06:49:27 2012
@@ -55,8 +55,16 @@ public:
*/
virtual ~EtchTcpListener();
+ /**
+ * @see EtchConnection
+ */
virtual capu::bool_t isStarted();
+ /**
+ * @see EtchConnection
+ */
+ virtual capu::bool_t isTerminated();
+
virtual status_t close();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp Wed
Oct 17 06:49:27 2012
@@ -21,7 +21,7 @@
#define MAILBOX_NOTIFY_TIMEOUT 2000
EtchAsyncResultNone::EtchAsyncResultNone(EtchRuntime* runtime, EtchMailbox* mailbox)
- : mRuntime(runtime), mMailbox(mailbox), mHasMailboxStatus(false), mHasException(false)
{
+ : mRuntime(runtime), mMailbox(mailbox), mHasMailboxStatus(false), mHasException(false),
mException(NULL) {
if(mailbox != NULL) {
mMailbox->registerNotify(this, NULL, MAILBOX_NOTIFY_TIMEOUT);
}
@@ -31,13 +31,14 @@ EtchAsyncResultNone::EtchAsyncResultNone
EtchAsyncResultNone::~EtchAsyncResultNone() {
if(mMailbox != NULL) {
mMailbox->unregisterNotify(this);
+ mMailbox->closeDelivery();
delete mMailbox;
}
}
capu::bool_t EtchAsyncResultNone::hasException() {
mMutex.lock();
- while(!mHasMailboxStatus) {
+ while(mMailbox != NULL && !mHasMailboxStatus) {
mCond.wait(&mMutex);
}
mMutex.unlock();
@@ -53,7 +54,10 @@ capu::SmartPointer<EtchException> EtchAs
void EtchAsyncResultNone::setException(capu::SmartPointer<EtchException> exception)
{
mException = exception;
mHasException = true;
+ setMailboxStatus();
+}
+void EtchAsyncResultNone::setMailboxStatus() {
mMutex.lock();
mHasMailboxStatus = true;
mCond.signal();
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Wed Oct 17
06:49:27 2012
@@ -44,7 +44,7 @@ public:
void run() {
if(mRunnable.get() != NULL) {
if(ETCH_OK != mRunnable->run()) {
- // Log exception
+ //TODO: Log exception
if(mRunnable->hasException()) {
capu::SmartPointer<EtchException> exception;
mRunnable->getException(&exception);
@@ -67,7 +67,7 @@ const EtchObjectType* EtchQueuedPool::TY
EtchQueuedPool::EtchQueuedPool(capu::int32_t size)
: mSizeMax(size), mIsOpen(true) {
addObjectType(TYPE());
- mPool = new capu::ThreadPool(mSizeMax);
+ mPool = new capu::ThreadPool(1);
}
EtchQueuedPool::~EtchQueuedPool() {
@@ -90,6 +90,7 @@ status_t EtchQueuedPool::add(capu::Smart
}
EtchQueuedPoolRunnable* pr = new EtchQueuedPoolRunnable(this, runnable);
+ //TODO: check max Size before adding a new Runnable
capu::status_t status = mPool->add(pr);
if(status != capu::CAPU_OK) {
return ETCH_ERROR;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp Wed
Oct 17 06:49:27 2012
@@ -32,6 +32,7 @@ EtchTcpConnection::EtchTcpConnection(Etc
}
mThread = NULL;
mIsStarted = false;
+ mIsTerminated = false;
mSession = NULL;
mSocket = socket;
}
@@ -96,7 +97,7 @@ status_t EtchTcpConnection::openSocket(c
mMutexConnection.unlock();
return ETCH_ERROR;
}
- // if a reconnect but no retries allowed, then fail.
+ // if a reconnect but retries not allowed, then fail.
if (reconnect && (mOptions.getReconnectDelay() == 0)) {
mMutexConnection.unlock();
return ETCH_ERROR;
@@ -255,6 +256,10 @@ capu::bool_t EtchTcpConnection::isStarte
return mIsStarted;
}
+capu::bool_t EtchTcpConnection::isTerminated() {
+ return mIsTerminated;
+}
+
void EtchTcpConnection::run() {
status_t status;
@@ -270,6 +275,7 @@ void EtchTcpConnection::run() {
status = setupSocket();
if (status != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Socket
has not been successfully opened", mHost.c_str(), mPort);
close();
break;
}
@@ -283,21 +289,26 @@ void EtchTcpConnection::run() {
close();
first = false;
}
+ mIsTerminated = true;
}
status_t EtchTcpConnection::setupSocket() {
if (mOptions.getBufferSize() != 0) {
if (mSocket->setBufferSize(mOptions.getBufferSize()) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => setupSocket:
Error while setting buffer size", mHost.c_str(), mPort);
return ETCH_ERROR;
}
}
if (mSocket->setKeepAlive((mOptions.getKeepAlive() != 0)) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => setupSocket:
Error while setting keep alive", mHost.c_str(), mPort);
return ETCH_ERROR;
}
if (mSocket->setLingerOption((mOptions.getLingerTime() >= 0), mOptions.getLingerTime())
!= ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => setupSocket:
Error while setting linger time", mHost.c_str(), mPort);
return ETCH_ERROR;
}
if (mSocket->setNoDelay((mOptions.getNoDelay() != 0)) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => setupSocket:
Error while setting delay", mHost.c_str(), mPort);
return ETCH_ERROR;
}
CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Settings for
socket has been successfully configured", mHost.c_str(), mPort);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp Wed Oct
17 06:49:27 2012
@@ -65,6 +65,7 @@ EtchTcpListener::EtchTcpListener(EtchURL
}
mSession = NULL;
mIsStarted = false;
+ mIsTerminated = false;
mThread = NULL;
mSocket = NULL;
mConnectionCheckerThread = NULL;
@@ -94,6 +95,10 @@ capu::bool_t EtchTcpListener::isStarted(
return mIsStarted;
}
+capu::bool_t EtchTcpListener::isTerminated() {
+ return mIsTerminated;
+}
+
status_t EtchTcpListener::close() {
if (mSocket != NULL) {
return mSocket->close();
@@ -276,6 +281,7 @@ void EtchTcpListener::run() {
first = false;
}
mIsStarted = false;
+ mIsTerminated = true;
}
status_t EtchTcpListener::setupSocket() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp?rev=1399113&r1=1399112&r2=1399113&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
Wed Oct 17 06:49:27 2012
@@ -176,7 +176,7 @@ status_t EtchTcpTransportFactory::MySess
if (res == ETCH_OK) {
EtchTcpConnection* con = (EtchTcpConnection*) stack->getTransportData();
if (con != NULL) {
- if (!con->isStarted()) {
+ if (con->isTerminated()) {
//delete all instances for this stack
delete stack;
//remote stack from list
Author: veithm
Date: Wed Oct 17 06:49:14 2012
New Revision: 1399112
URL: http://svn.apache.org/viewvc?rev=1399112&view=rev
Log:
ETCH-249 Added EtchNumber class
Etch number types derive now from EtchNumber
BinaryTaggedDataOutput uses EtchNumber to get the value
Change-Id: I7a487dcab3e6f489083031008ca91912da7655d0
Added:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNumber.h
- copied, changed from r1399111, incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp (with props)
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h Wed Oct 17 06:49:14
2012
@@ -19,12 +19,12 @@
#ifndef __ETCHBYTE_H__
#define __ETCHBYTE_H__
-#include "common/EtchObject.h"
+#include "common/EtchNumber.h"
#include "common/EtchObjectType.h"
#include "common/EtchError.h"
class EtchByte :
-public EtchObject {
+public EtchNumber {
public:
@@ -69,6 +69,27 @@ public:
*/
capu::uint32_t getHashCode() const;
+ /**
+ * @see EtchNumber
+ */
+ capu::int64_t getLongValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int32_t getInt32Value() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int16_t getShortValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int8_t getByteValue() const;
+
+
private:
capu::int8_t mValue;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h Wed Oct 17 06:49:14
2012
@@ -19,10 +19,10 @@
#ifndef __ETCHINT32_H__
#define __ETCHINT32_H__
-#include "common/EtchObject.h"
+#include "common/EtchNumber.h"
class EtchInt32 :
-public EtchObject {
+public EtchNumber {
public:
@@ -114,6 +114,26 @@ public:
*/
capu::bool_t operator!=(const EtchObject& other) const;
+ /**
+ * @see EtchNumber
+ */
+ capu::int64_t getLongValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int32_t getInt32Value() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int16_t getShortValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int8_t getByteValue() const;
+
private:
capu::int32_t mValue;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h Wed Oct 17 06:49:14
2012
@@ -19,12 +19,12 @@
#ifndef __ETCHLONG_H__
#define __ETCHLONG_H__
-#include "common/EtchObject.h"
+#include "common/EtchNumber.h"
#include "common/EtchObjectType.h"
#include "common/EtchError.h"
class EtchLong :
-public EtchObject {
+public EtchNumber {
public:
@@ -70,6 +70,26 @@ public:
*/
capu::bool_t equals(const EtchObject * other) const;
+ /**
+ * @see EtchNumber
+ */
+ capu::int64_t getLongValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int32_t getInt32Value() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int16_t getShortValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int8_t getByteValue() const;
+
private:
capu::int64_t mValue;
Copied: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNumber.h (from r1399111,
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNumber.h?p2=incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNumber.h&p1=incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h&r1=1399111&r2=1399112&rev=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNumber.h Wed Oct 17 06:49:14
2012
@@ -1,81 +1,71 @@
-/* $Id$
- *
- * 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.
- */
-
-#ifndef __ETCHLONG_H__
-#define __ETCHLONG_H__
-
-#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
-
-class EtchLong :
-public EtchObject {
-
-public:
-
- /**
- * EtchObjectType for EtchLong.
- */
- static const EtchObjectType* TYPE();
-
- /**
- * Constructs a EtchLong object.
- */
- EtchLong();
-
- /**
- * Constructs a EtchLong object with given value.
- */
- EtchLong(capu::int64_t value);
-
- /**
- * Constructs a copy of EtchLong.
- */
- EtchLong(const EtchLong& other);
-
-
- /**
- * Sets long value.
- */
- void set(capu::int64_t value);
-
- /**
- * Returns long value.
- */
- capu::int64_t get();
-
- /**
- * Returns hash code
- */
- capu::uint32_t getHashCode() const;
-
- /**
- * @return true if two object is equal
- * false otherwise
- */
- capu::bool_t equals(const EtchObject * other) const;
-
-private:
-
- capu::int64_t mValue;
-
-};
-
-typedef capu::SmartPointer<EtchLong> EtchLongPtr;
-
-#endif
+/* $Id$
+ *
+ * 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.
+ */
+
+#ifndef __ETCHNUMBER_H__
+#define __ETCHNUMBER_H__
+
+#include "common/EtchObject.h"
+#include "common/EtchObjectType.h"
+
+class EtchNumber :
+public EtchObject {
+
+public:
+
+ /**
+ * EtchObjectType for EtchLong.
+ */
+ static const EtchObjectType* TYPE() {
+ const static EtchObjectType TYPE(EOTID_NUMBER, NULL);
+ return &TYPE;
+ }
+
+ /**
+ * Constructor
+ */
+ EtchNumber() {
+ addObjectType(TYPE());
+ }
+
+ /**
+ * returns the value as a long
+ * @return int64 value
+ */
+ virtual capu::int64_t getLongValue() const = 0;
+
+ /**
+ * returns the value as an int32
+ * @return int32 value
+ */
+ virtual capu::int32_t getInt32Value() const = 0;
+
+ /**
+ * returns the value as a short
+ * @return int16 value
+ */
+ virtual capu::int16_t getShortValue() const = 0;
+
+ /**
+ * returns the value as a byte
+ * @return int8 value
+ */
+ virtual capu::int8_t getByteValue() const = 0;
+
+};
+
+#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h Wed Oct 17 06:49:14
2012
@@ -27,6 +27,7 @@
enum EtchObjectTypeIds {
EOTID_OBJECT = 0,
+ EOTID_NUMBER,
EOTID_INT32,
EOTID_BOOL,
EOTID_BYTE,
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h Wed Oct 17 06:49:14
2012
@@ -19,12 +19,12 @@
#ifndef __ETCHSHORT_H__
#define __ETCHSHORT_H__
-#include "common/EtchObject.h"
+#include "common/EtchNumber.h"
#include "common/EtchObjectType.h"
#include "common/EtchError.h"
class EtchShort :
-public EtchObject {
+public EtchNumber {
public:
@@ -69,6 +69,26 @@ public:
*/
capu::bool_t equals(const EtchObject * other) const;
+ /**
+ * @see EtchNumber
+ */
+ capu::int64_t getLongValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int32_t getInt32Value() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int16_t getShortValue() const;
+
+ /**
+ * @see EtchNumber
+ */
+ capu::int8_t getByteValue() const;
+
private:
capu::int16_t mValue;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt Wed Oct 17 06:49:14 2012
@@ -24,6 +24,7 @@ SET(MAIN_INCLUDES
${PROJECT_SOURCE_DIR}/include/common/EtchObject.h
${PROJECT_SOURCE_DIR}/include/common/EtchObjectType.h
${PROJECT_SOURCE_DIR}/include/common/EtchString.h
+ ${PROJECT_SOURCE_DIR}/include/common/EtchNumber.h
${PROJECT_SOURCE_DIR}/include/common/EtchInt32.h
${PROJECT_SOURCE_DIR}/include/common/EtchBool.h
${PROJECT_SOURCE_DIR}/include/common/EtchByte.h
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp Wed Oct 17 06:49:14
2012
@@ -34,7 +34,8 @@ EtchByte::EtchByte(capu::int8_t value)
}
EtchByte::EtchByte(const EtchByte &other)
- : EtchObject(other), mValue(other.mValue) {
+ : mValue(other.mValue) {
+ addObjectType(TYPE());
}
void EtchByte::set(capu::int8_t value){
@@ -59,3 +60,19 @@ capu::uint32_t EtchByte::getHashCode() c
capu::uint32_t result = mValue + 128;
return result;
}
+
+capu::int64_t EtchByte::getLongValue() const {
+ return static_cast<capu::int64_t>(mValue);
+}
+
+capu::int32_t EtchByte::getInt32Value() const {
+ return static_cast<capu::int32_t>(mValue);
+}
+
+capu::int16_t EtchByte::getShortValue() const {
+ return static_cast<capu::int16_t>(mValue);
+}
+
+capu::int8_t EtchByte::getByteValue() const {
+ return mValue;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp Wed Oct 17 06:49:14
2012
@@ -36,7 +36,8 @@ EtchInt32::EtchInt32(capu::int32_t value
}
EtchInt32::EtchInt32(const EtchInt32& other)
- : EtchObject(other), mValue(other.mValue) {
+ : mValue(other.mValue) {
+ addObjectType(TYPE());
}
EtchInt32::~EtchInt32() {
@@ -116,3 +117,19 @@ capu::bool_t EtchInt32::operator!=(const
{
return !(*this == other);
}
+
+capu::int64_t EtchInt32::getLongValue() const {
+ return static_cast<capu::int64_t>(mValue);
+}
+
+capu::int32_t EtchInt32::getInt32Value() const {
+ return mValue;
+}
+
+capu::int16_t EtchInt32::getShortValue() const {
+ return static_cast<capu::int16_t>(mValue);
+}
+
+capu::int8_t EtchInt32::getByteValue() const {
+ return static_cast<capu::int8_t>(mValue);
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp Wed Oct 17 06:49:14
2012
@@ -34,7 +34,8 @@ EtchLong::EtchLong(capu::int64_t value)
}
EtchLong::EtchLong(const EtchLong& other)
- : EtchObject(other), mValue(other.mValue) {
+ : mValue(other.mValue) {
+ addObjectType(TYPE());
}
void EtchLong::set(capu::int64_t value) {
@@ -58,3 +59,19 @@ capu::bool_t EtchLong::equals(const Etch
EtchLong * a = (EtchLong*) other;
return (a->mValue == this->mValue);
}
+
+capu::int64_t EtchLong::getLongValue() const {
+ return mValue;
+}
+
+capu::int32_t EtchLong::getInt32Value() const {
+ return static_cast<capu::int32_t>(mValue);
+}
+
+capu::int16_t EtchLong::getShortValue() const {
+ return static_cast<capu::int16_t>(mValue);
+}
+
+capu::int8_t EtchLong::getByteValue() const {
+ return static_cast<capu::int8_t>(mValue);
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp Wed Oct 17 06:49:14
2012
@@ -34,7 +34,8 @@ EtchShort::EtchShort(capu::int16_t value
}
EtchShort::EtchShort(const EtchShort& other)
- : EtchObject(other), mValue(other.mValue) {
+ : mValue(other.mValue) {
+ addObjectType(TYPE());
}
void EtchShort::set(capu::int16_t value) {
@@ -59,3 +60,19 @@ capu::bool_t EtchShort::equals(const Etc
EtchShort * a = (EtchShort*) other;
return (a->mValue == this->mValue);
}
+
+capu::int64_t EtchShort::getLongValue() const {
+ return static_cast<capu::int64_t>(mValue);
+}
+
+capu::int32_t EtchShort::getInt32Value() const {
+ return static_cast<capu::int32_t>(mValue);
+}
+
+capu::int16_t EtchShort::getShortValue() const {
+ return mValue;
+}
+
+capu::int8_t EtchShort::getByteValue() const {
+ return static_cast<capu::int8_t>(mValue);
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
Wed Oct 17 06:49:14 2012
@@ -304,19 +304,19 @@ status_t EtchBinaryTaggedDataOutput::wri
case EtchTypeCode::BYTE:
CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Byte has been serialized");
- return mBuffer->putByte(((EtchByte*) value.get())->get());
+ return mBuffer->putByte(((EtchNumber*) value.get())->getByteValue());
case EtchTypeCode::SHORT:
CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Short has been serialized");
- return mBuffer->putShort(((EtchShort*) value.get())->get());
+ return mBuffer->putShort(((EtchNumber*) value.get())->getShortValue());
case EtchTypeCode::INT:
CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Int has been serialized");
- return mBuffer->putInt(((EtchInt32*) value.get())->get());
+ return mBuffer->putInt(((EtchNumber*) value.get())->getInt32Value());
case EtchTypeCode::LONG:
CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Long has been serialized");
- return mBuffer->putLong(((EtchLong*) value.get())->get());
+ return mBuffer->putLong(((EtchNumber*) value.get())->getLongValue());
case EtchTypeCode::FLOAT:
CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Float has been serialized");
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt?rev=1399112&r1=1399111&r2=1399112&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt Wed Oct 17 06:49:14 2012
@@ -30,7 +30,8 @@ IF (WIN32 AND BUILD_CHECK_MEMORY)
ENDIF (WIN32 AND BUILD_CHECK_MEMORY)
add_executable (etch-cpp-test
- common/EtchInt32Test.cpp
+ common/EtchNumberTest.cpp
+ common/EtchInt32Test.cpp
common/EtchBoolTest.cpp
common/EtchByteTest.cpp
common/EtchShortTest.cpp
Added: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp?rev=1399112&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp (added)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp Wed Oct 17
06:49:14 2012
@@ -0,0 +1,32 @@
+/* $Id$
+ *
+ * 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 <gtest/gtest.h>
+#include "common/EtchNumber.h"
+#include "common/EtchByte.h"
+#include "common/EtchString.h"
+
+TEST(EtchNumberTest, isInstanceOf) {
+ EtchNumber* o1 = new EtchByte(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchNumber::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchByte::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Propchange: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNumberTest.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp Wed Oct 17 06:48:53 2012
@@ -24,13 +24,17 @@ const EtchObjectType* EtchStructValue::T
}
EtchStructValue::EtchStructValue(EtchType* type, EtchValueFactory* vf)
-: EtchObject(EtchStructValue::TYPE()), mType(type), mLevel(vf->getLevel()), mTable(DEFAULT_SIZE) {
-
+ : mType(type), mLevel(vf->getLevel()), mTable(DEFAULT_SIZE) {
+ addObjectType(TYPE());
}
EtchStructValue::EtchStructValue(EtchType* type, EtchValueFactory* vf, capu::uint32_t length)
-: EtchObject(EtchStructValue::TYPE()), mType(type), mLevel(vf->getLevel()), mTable(length > 0 ? (length * 4 + 2) / 3 : DEFAULT_SIZE) {
+ : mType(type), mLevel(vf->getLevel()), mTable(length > 0 ? (length * 4 + 2) / 3 : DEFAULT_SIZE) {
+ addObjectType(TYPE());
+}
+EtchStructValue::EtchStructValue(const EtchStructValue& other)
+ : EtchObject(other), mType(other.mType), mLevel(other.mLevel), mTable(other.mTable) {
}
EtchStructValue::~EtchStructValue() {
@@ -93,7 +97,7 @@ status_t EtchStructValue::get(const Etch
return mTable.get(key, value);
}
-EtchStructValue::Iterator EtchStructValue::begin()
+EtchStructValue::Iterator EtchStructValue::begin() const
{
return mTable.begin();
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp Wed Oct 17 06:48:53 2012
@@ -23,21 +23,29 @@ const EtchObjectType* EtchType::TYPE() {
const static EtchObjectType TYPE(EOTID_TYPE, NULL);
return &TYPE;
}
-
EtchType::EtchType()
-: EtchObject(EtchType::TYPE()), mId(0), mTimeout(0), mName(""), mSuperType(NULL),
-mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+: mId(0), mTimeout(0), mName(""), mSuperType(NULL), mResultType(NULL),
+ mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+ addObjectType(TYPE());
}
EtchType::EtchType(EtchString name)
-: EtchObject(EtchType::TYPE()), mTimeout(0), mName(name), mSuperType(NULL),
+: mTimeout(0), mName(name), mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
- mId = EtchHashEx::Digest(mName);;
+ mId = EtchHashEx::Digest(mName);
+ addObjectType(TYPE());
}
EtchType::EtchType(capu::uint32_t id, EtchString name)
-: EtchObject(EtchType::TYPE()), mId(id), mTimeout(0), mName(name), mSuperType(NULL),
+: mId(id), mTimeout(0), mName(name), mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+ addObjectType(TYPE());
+}
+
+EtchType::EtchType(const EtchType& other)
+ : EtchObject(other), mId(other.mId), mTimeout(other.mTimeout), mName(other.mName), mSuperType(other.mSuperType),
+ mResultType(other.mResultType), mDirection(other.mDirection), mAsyncMode(other.mAsyncMode), mLocked(other.mLocked),
+ mComponentType(other.mComponentType), mHelper(other.mHelper), mStubHelper(other.mStubHelper) {
}
EtchType::~EtchType() {
@@ -49,7 +57,6 @@ EtchType::~EtchType() {
//TODO: Check memory management
delete mStubHelper;
}
-
}
capu::uint64_t EtchType::getHashCode() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp Wed Oct 17 06:48:53 2012
@@ -25,7 +25,7 @@ EtchTypeValidator::EtchTypeValidator(con
if (mNDims == 0)
mExpectedType = new EtchObjectType(scalarClass->getTypeId(),scalarClass->getObjectComponentType());
- else if (mNDims > 0){
+ else if (mNDims > 0){
EtchObjectType *type = new EtchObjectType(EOTID_NATIVE_ARRAY, scalarClass);
mExpectedType = type;
mArrayComponentType = scalarClass;
@@ -33,6 +33,11 @@ EtchTypeValidator::EtchTypeValidator(con
}
+EtchTypeValidator::EtchTypeValidator(const EtchTypeValidator& other)
+ : EtchValidator(other), mNDims(other.mNDims), mExpectedType(other.mExpectedType),
+ mArrayComponentType(other.mArrayComponentType), mSubclass(other.mSubclass) {
+}
+
EtchTypeValidator::~EtchTypeValidator(){
delete mExpectedType;
}
@@ -50,4 +55,4 @@ status_t EtchTypeValidator::checkDimensi
return ETCH_OK;
else
return ETCH_ERROR;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,10 @@ EtchValidatorBoolean::EtchValidatorBoole
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorBoolean::EtchValidatorBoolean(const EtchValidatorBoolean& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+}
+
EtchValidatorBoolean::~EtchValidatorBoolean() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorByte::EtchValidatorByte(cap
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorByte::EtchValidatorByte(const EtchValidatorByte& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorByte::~EtchValidatorByte() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp Wed Oct 17 06:48:53 2012
@@ -82,17 +82,17 @@ const EtchObjectType* EtchValidatorCusto
}
EtchValidatorCustomKey::EtchValidatorCustomKey()
-: EtchObject(EtchValidatorCustomKey::TYPE())
-, mType(NULL)
-, mDims(0)
-, mSubclassOk(false) {
+ : mType(NULL), mDims(0), mSubclassOk(false) {
+ addObjectType(EtchValidatorCustomKey::TYPE());
}
EtchValidatorCustomKey::EtchValidatorCustomKey(const EtchObjectType * type, capu::int32_t dim, capu::bool_t sub)
-: EtchObject(EtchValidatorCustomKey::TYPE())
-, mType(type)
-, mDims(dim)
-, mSubclassOk(sub) {
+ : mType(type), mDims(dim), mSubclassOk(sub) {
+ addObjectType(EtchValidatorCustomKey::TYPE());
+}
+
+EtchValidatorCustomKey::EtchValidatorCustomKey(const EtchValidatorCustomKey& other)
+ : EtchObject(other), mType(other.mType), mDims(other.mDims), mSubclassOk(other.mSubclassOk) {
}
EtchValidatorCustomKey::~EtchValidatorCustomKey() {
@@ -122,6 +122,11 @@ EtchValidatorCustom::EtchValidatorCustom
mSubclass = sub;
}
+EtchValidatorCustom::EtchValidatorCustom(const EtchValidatorCustom& other)
+ : EtchTypeValidator(other) {
+
+}
+
EtchValidatorCustom::~EtchValidatorCustom() {
}
@@ -173,4 +178,4 @@ status_t EtchValidatorCustom::getElement
EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >& EtchValidatorCustom::Validators(EtchRuntime* runtime) {
static EtchValidatorCustomCaches validators;
return validators.get(runtime);
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp Wed Oct 17 06:48:53 2012
@@ -36,6 +36,11 @@ EtchValidatorDouble::EtchValidatorDouble
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorDouble::EtchValidatorDouble(const EtchValidatorDouble& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorDouble::~EtchValidatorDouble() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorFloat::EtchValidatorFloat(c
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorFloat::EtchValidatorFloat(const EtchValidatorFloat& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorFloat::~EtchValidatorFloat() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorInt::EtchValidatorInt(capu:
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorInt::EtchValidatorInt(const EtchValidatorInt& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorInt::~EtchValidatorInt() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorLong::EtchValidatorLong(cap
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorLong::EtchValidatorLong(const EtchValidatorLong& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorLong::~EtchValidatorLong() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp Wed Oct 17 06:48:53 2012
@@ -35,6 +35,11 @@ EtchValidatorNone::EtchValidatorNone()
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorNone::EtchValidatorNone(const EtchValidatorNone& other)
+: EtchValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorNone::~EtchValidatorNone() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp Wed Oct 17 06:48:53 2012
@@ -36,6 +36,11 @@ EtchValidatorObject::EtchValidatorObject
mSubclass = true;
}
+EtchValidatorObject::EtchValidatorObject(const EtchValidatorObject& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorObject::~EtchValidatorObject() {
}
@@ -63,7 +68,7 @@ status_t EtchValidatorObject::validateVa
status_t EtchValidatorObject::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
//TODO rafactor this
EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+
if (ndim > MAX_NDIMS)
return ETCH_EINVAL;
if (ndim >= MAX_CACHED) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorRuntimeException::EtchValid
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorRuntimeException::EtchValidatorRuntimeException(const EtchValidatorRuntimeException& other)
+: EtchValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorRuntimeException::~EtchValidatorRuntimeException() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorShort::EtchValidatorShort(c
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorShort::EtchValidatorShort(const EtchValidatorShort& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorShort::~EtchValidatorShort() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorString::EtchValidatorString
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorString::EtchValidatorString(const EtchValidatorString& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorString::~EtchValidatorString() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp Wed Oct 17 06:48:53 2012
@@ -32,6 +32,11 @@ EtchValidatorStructValue::EtchValidatorS
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorStructValue::EtchValidatorStructValue(const EtchValidatorStructValue& other)
+: EtchTypeValidator(other), mType(other.mType), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorStructValue::~EtchValidatorStructValue() {
}
@@ -85,4 +90,4 @@ status_t EtchValidatorStructValue::Get(E
EtchType* EtchValidatorStructValue::getType() {
return mType;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp Wed Oct 17 06:48:53 2012
@@ -23,8 +23,12 @@ const EtchObjectType* EtchValueFactory::
return &TYPE;
}
-EtchValueFactory::EtchValueFactory()
-: EtchObject(EtchValueFactory::TYPE()) {
+EtchValueFactory::EtchValueFactory() {
+ addObjectType(EtchValueFactory::TYPE());
+}
+
+EtchValueFactory::EtchValueFactory(const EtchValueFactory& other)
+ : EtchObject(other) {
}
EtchString EtchValueFactory::getStringEncoding() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp Wed Oct 17 06:48:53 2012
@@ -67,13 +67,10 @@ const EtchObjectType* EtchFreePool::TYPE
}
EtchFreePool::EtchFreePool(capu::int32_t size)
- : EtchPool(EtchFreePool::TYPE())
- , mSize(0)
- , mSizeMax(size)
- , mIsOpen(true) {
-
- mThreads = new capu::Thread*[mSizeMax];
- capu::Memory::Set(mThreads, 0, sizeof(capu::Thread*)*mSizeMax);
+ : mSize(0), mSizeMax(size), mIsOpen(true) {
+ addObjectType(TYPE());
+ mThreads = new capu::Thread*[mSizeMax];
+ capu::Memory::Set(mThreads, 0, sizeof(capu::Thread*)*mSizeMax);
}
EtchFreePool::~EtchFreePool() {
@@ -116,7 +113,7 @@ status_t EtchFreePool::add(capu::SmartPo
if(!mIsOpen) {
return ETCH_ERROR;
}
-
+
mMutex.lock();
// clean thread list
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp Wed Oct 17 06:48:53 2012
@@ -20,3 +20,7 @@
#include "support/EtchPool.h"
+const EtchObjectType* EtchPool::TYPE() {
+ const static EtchObjectType TYPE(EOTID_POOL, NULL);
+ return &TYPE;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Wed Oct 17 06:48:53 2012
@@ -65,10 +65,9 @@ const EtchObjectType* EtchQueuedPool::TY
}
EtchQueuedPool::EtchQueuedPool(capu::int32_t size)
- : EtchPool(EtchQueuedPool::TYPE())
- , mSizeMax(size)
- , mIsOpen(true) {
- mPool = new capu::ThreadPool(mSizeMax);
+: mSizeMax(size), mIsOpen(true) {
+ addObjectType(TYPE());
+ mPool = new capu::ThreadPool(mSizeMax);
}
EtchQueuedPool::~EtchQueuedPool() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp Wed Oct 17 06:48:53 2012
@@ -38,7 +38,18 @@ EtchStack::EtchStack() : EtchObject()
, mDeliveryService(NULL)
, mStub(NULL)
{
- EtchObject::addObjectType(EtchStack::TYPE());
+ addObjectType(EtchStack::TYPE());
+}
+
+EtchStack::EtchStack(const EtchStack& other) : EtchObject(other)
+, mTransportData(other.mTransportData)
+, mTransportPacket(other.mTransportPacket)
+, mTransportMessage(other.mTransportMessage)
+, mResources(other.mResources)
+, mValueFactory(other.mValueFactory)
+, mMailboxManager(other.mMailboxManager)
+, mDeliveryService(other.mDeliveryService)
+, mStub(other.mStub) {
}
EtchStack::~EtchStack() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp Wed Oct 17 06:48:53 2012
@@ -24,8 +24,13 @@ const EtchObjectType* EtchStackClient::T
}
EtchStackClient::EtchStackClient() : EtchStack(), mStaticResources(NULL) {
- EtchObject::addObjectType(EtchStackClient::TYPE());
- EtchObject::setObjectType(EtchStackClient::TYPE());
+ addObjectType(EtchStackClient::TYPE());
+}
+
+EtchStackClient::EtchStackClient(const EtchStackClient& other)
+ : EtchStack(other), mStaticResources(other.mStaticResources)
+{
+
}
EtchStackClient::~EtchStackClient() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp Wed Oct 17 06:48:53 2012
@@ -23,11 +23,12 @@ const EtchObjectType* EtchStackServer::T
}
EtchStackServer::EtchStackServer()
-: EtchStack()
- , mRemote(NULL)
-{
- EtchObject::addObjectType(EtchStackServer::TYPE());
- EtchObject::setObjectType(EtchStackServer::TYPE());
+: EtchStack(), mRemote(NULL) {
+ addObjectType(EtchStackServer::TYPE());
+}
+
+EtchStackServer::EtchStackServer(const EtchStackServer& other)
+: EtchStack(other), mRemote(other.mRemote) {
}
EtchStackServer::~EtchStackServer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp Wed Oct 17 06:48:53 2012
@@ -29,6 +29,10 @@ EtchMessage::EtchMessage(EtchType* type,
}
+EtchMessage::EtchMessage(const EtchMessage& other)
+ : EtchStructValue(other), mVf(other.mVf) {
+}
+
EtchMessage::~EtchMessage() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp Wed Oct 17 06:48:53 2012
@@ -195,5 +195,22 @@ TEST(EtchArrayValueTest, addTest) {
delete av2;
}
+TEST(EtchArrayValueTest, copyTest) {
+ capu::SmartPointer<EtchNativeArray<capu::int8_t> > nativeTypeArray = new EtchNativeArray<capu::int8_t>(1);
+ nativeTypeArray->set(0, 1);
+ EtchArrayValue o1(nativeTypeArray, 1);
+ EtchArrayValue o2(o1);
+ EtchArrayValue o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+TEST(EtchArrayValueTest, isInstanceOf) {
+ capu::SmartPointer<EtchNativeArray<capu::int8_t> > nativeTypeArray = new EtchNativeArray<capu::int8_t>(1);
+ EtchObject* o1 = new EtchArrayValue(nativeTypeArray, 1);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchArrayValue::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -60,3 +60,22 @@ TEST(EtchAuthenticationExceptionTest, eq
delete test2;
delete test3;
}
+
+TEST(EtchAuthenticationExceptionTest, copyTest) {
+ EtchString str("test message");
+ EtchAuthenticationException o1(str);
+ EtchAuthenticationException o2(o1);
+ EtchAuthenticationException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchAuthenticationExceptionTest, isInstanceOf) {
+ EtchString str("test message");
+ EtchObject* o1 = new EtchAuthenticationException(str);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchAuthenticationException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,62 @@
#include <gtest/gtest.h>
#include "common/EtchBool.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchBoolTest, Constructor_Default){
EtchBool* i1 = new EtchBool();
EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
- EXPECT_TRUE(i1->get() == false);
+ EXPECT_FALSE(i1->get());
delete i1;
}
TEST(EtchBoolTest, Constructor_Bool){
EtchBool* i1 = new EtchBool(true);
EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, set){
EtchBool* i1 = new EtchBool();
i1->set(true);
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, get){
EtchBool* i1 = new EtchBool();
- EXPECT_TRUE(i1->get() == false);
+ EXPECT_FALSE(i1->get());
i1->set(true);
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, equals){
EtchBool i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(true);
i2.set(false);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(true);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
+
+TEST(EtchBoolTest, copyTest) {
+ EtchBool o1(true);
+ EtchBool o2(o1);
+ EtchBool o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchBoolTest, isInstanceOf) {
+ EtchObject* o1 = new EtchBool(true);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchBool::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,63 @@
#include <gtest/gtest.h>
#include "common/EtchByte.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchByteTest, Constructor_Default){
EtchByte* i1 = new EtchByte();
EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchByteTest, Constructor_Byte){
EtchByte* i1 = new EtchByte(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchByteTest, set){
EtchByte* i1 = new EtchByte();
i1->set(43);
- EXPECT_TRUE(i1->get() == 43);
+ EXPECT_EQ(43, i1->get());
delete i1;
}
TEST(EtchByteTest, get){
EtchByte* i1 = new EtchByte();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(41);
- EXPECT_TRUE(i1->get() == 41);
+ EXPECT_EQ(41, i1->get());
delete i1;
}
TEST(EtchByteTest, equals){
EtchByte i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
+
+
+TEST(EtchByteTest, copyTest) {
+ EtchByte o1(2);
+ EtchByte o2(o1);
+ EtchByte o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchByteTest, isInstanceOf) {
+ EtchObject* o1 = new EtchByte(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchByte::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchDate.h"
+#include "common/EtchString.h"
TEST(EtchDateTest, Constructor) {
EtchDate* i1 = new EtchDate();
@@ -49,3 +50,22 @@ TEST(EtchDateTest, equals) {
i2.set(_time);
EXPECT_TRUE(i1.equals(&i2) == true);
}
+
+
+TEST(EtchDateTest, copyTest) {
+ EtchDate o1;
+ time_t _time = 1234567;
+ o1.set(_time);
+ EtchDate o2(o1);
+ EtchDate o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchDateTest, isInstanceOf) {
+ EtchObject* o1 = new EtchDate();
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchDate::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchDouble.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchDoubleTest, Constructor_Default){
EtchDouble* i1 = new EtchDouble();
EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
- EXPECT_TRUE(i1->get() == 0.0L);
+ EXPECT_EQ(0.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, Constructor_Double){
EtchDouble* i1 = new EtchDouble(42.0L);
EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
- EXPECT_TRUE(i1->get() == 42.0L);
+ EXPECT_EQ(42.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, set){
EtchDouble* i1 = new EtchDouble();
i1->set(43.0L);
- EXPECT_EQ(i1->get(), 43.0L);
+ EXPECT_EQ(43.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, get){
EtchDouble* i1 = new EtchDouble();
- EXPECT_TRUE(i1->get() == 0.0L);
+ EXPECT_EQ(0.0L, i1->get());
i1->set(41.0L);
- EXPECT_TRUE(i1->get() == 41.0L);
+ EXPECT_EQ(41.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, equals){
EtchDouble i1, i2;
- EXPECT_TRUE(i1.get() == 0.0);
+ EXPECT_EQ(0.0L, i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchDoubleTest, copyTest) {
+ EtchDouble o1(2.123);
+ EtchDouble o2(o1);
+ EtchDouble o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchDoubleTest, isInstanceOf) {
+ EtchObject* o1 = new EtchDouble(2.123);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchDouble::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchException.h"
+#include "common/EtchString.h"
TEST(EtchExceptionTest, createTest) {
EtchString str("test message");
@@ -59,3 +60,19 @@ TEST(EtchExceptionTest, equalsTest) {
delete test2;
delete test3;
}
+
+TEST(EtchExceptionTest, copyTest) {
+ EtchException o1(EtchString("Message"), ETCH_ERROR, EtchException::EXCPTYPE_BUILTIN);
+ EtchException o2(o1);
+ EtchException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchExceptionTest, isInstanceOf) {
+ EtchObject* o1 = new EtchException(EtchString("Message"), ETCH_ERROR, EtchException::EXCPTYPE_BUILTIN);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchFloat.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchFloatTest, Constructor_Default){
EtchFloat* i1 = new EtchFloat();
EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
- EXPECT_TRUE(i1->get() == 0.0f);
+ EXPECT_EQ(0.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, Constructor_Float){
EtchFloat* i1 = new EtchFloat(42.0f);
EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
- EXPECT_TRUE(i1->get() == 42.0f);
+ EXPECT_EQ(42.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, set){
EtchFloat* i1 = new EtchFloat();
i1->set(43.33f);
- EXPECT_TRUE(i1->get() == 43.33f);
+ EXPECT_EQ(43.33f, i1->get());
delete i1;
}
TEST(EtchFloatTest, get){
EtchFloat* i1 = new EtchFloat();
- EXPECT_TRUE(i1->get() == 0.0f);
+ EXPECT_EQ(0.0f, i1->get());
i1->set(41.0f);
- EXPECT_TRUE(i1->get() == 41.0f);
+ EXPECT_EQ(41.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, equals){
EtchFloat i1, i2;
- EXPECT_TRUE(i1.get() == 0.0f);
+ EXPECT_EQ(0.0f, i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchFloatTest, copyTest) {
+ EtchFloat o1(2.123);
+ EtchFloat o2(o1);
+ EtchFloat o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchFloatTest, isInstanceOf) {
+ EtchObject* o1 = new EtchFloat(2.123);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchFloat::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchInt32.h"
+#include "common/EtchString.h"
// Tests positive input.
@@ -31,33 +32,33 @@ TEST(EtchInt32Test, Constructor_Default)
TEST(EtchInt32Test, Constructor_Int){
EtchInt32* i1 = new EtchInt32(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchInt32::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, set){
EtchInt32* i1 = new EtchInt32();
i1->set(42);
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, get){
EtchInt32* i1 = new EtchInt32();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(42);
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, equals){
EtchInt32 i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
TEST(EtchInt32Test, operator_equal){
@@ -127,3 +128,19 @@ TEST(EtchInt32Test, operator_unequal){
++b;
EXPECT_FALSE(a != b);
}
+
+TEST(EtchInt32Test, copyTest) {
+ EtchInt32 o1(2);
+ EtchInt32 o2(o1);
+ EtchInt32 o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchInt32Test, isInstanceOf) {
+ EtchObject* o1 = new EtchInt32(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchInt32::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp Wed Oct 17 06:48:53 2012
@@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include "common/EtchInt32.h"
#include "common/EtchList.h"
+#include "common/EtchString.h"
TEST(EtchList, Constructor_Default) {
//create an empty linked list
@@ -369,3 +370,23 @@ TEST(EtchListIterator, next) {
}
+TEST(EtchList, copyTest) {
+ EtchList<EtchInt32> o1;
+ o1.add(EtchInt32(2));
+ o1.add(EtchInt32(3));
+ EtchList<EtchInt32> o2(o1);
+ EtchList<EtchInt32> o3 = o2;
+
+ EXPECT_EQ(o1.size(), o2.size());
+ EXPECT_EQ(o2.size(), o3.size());
+}
+
+TEST(EtchList, isInstanceOf) {
+ EtchObject* o1 = new EtchList<EtchInt32>();
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchList<EtchInt32>::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,27 +18,28 @@
#include <gtest/gtest.h>
#include "common/EtchLong.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchLongTest, Constructor_Default){
EtchLong* i1 = new EtchLong();
EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchLongTest, Constructor_Long){
EtchLong* i1 = new EtchLong(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchLongTest, set){
EtchLong* i1 = new EtchLong();
i1->set(43000000);
- EXPECT_TRUE(i1->get() == 43000000);
+ EXPECT_EQ(43000000, i1->get());
delete i1;
}
@@ -52,10 +53,26 @@ TEST(EtchLongTest, get){
TEST(EtchLongTest, equals){
EtchLong i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchLongTest, copyTest) {
+ EtchLong o1(2);
+ EtchLong o2(o1);
+ EtchLong o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchLongTest, isInstanceOf) {
+ EtchObject* o1 = new EtchLong(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchLong::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp Wed Oct 17 06:48:53 2012
@@ -71,9 +71,9 @@ TEST(EtchObjectTest, getTypeTrait) {
TEST(EtchObjectTest, isInstanceOf) {
EtchObjectMy1Object* o1 = new EtchObjectMy1Object();
- EXPECT_EQ(true, o1->isInstanceOf(EtchObjectMy1Object::TYPE()));
- EXPECT_EQ(true, o1->isInstanceOf(EtchObject::TYPE()));
- EXPECT_EQ(false, o1->isInstanceOf(EtchObjectMy2Object::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObjectMy1Object::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchObjectMy2Object::TYPE()));
delete o1;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -59,3 +59,20 @@ TEST(EtchRuntimeExceptionTest, equalsTes
delete test2;
delete test3;
}
+
+TEST(EtchRuntimeExceptionTest, copyTest) {
+ EtchRuntimeException o1(EtchString("Message"), ETCH_ERROR);
+ EtchRuntimeException o2(o1);
+ EtchRuntimeException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchRuntimeExceptionTest, isInstanceOf) {
+ EtchObject* o1 = new EtchRuntimeException(EtchString("Message"), ETCH_ERROR);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchRuntimeException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchShort.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchShortTest, Constructor_Default){
EtchShort* i1 = new EtchShort();
EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchShortTest, Constructor_Short){
EtchShort* i1 = new EtchShort(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchShortTest, set){
EtchShort* i1 = new EtchShort();
i1->set(43);
- EXPECT_TRUE(i1->get() == 43);
+ EXPECT_EQ(43, i1->get());
delete i1;
}
TEST(EtchShortTest, get){
EtchShort* i1 = new EtchShort();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(41);
- EXPECT_TRUE(i1->get() == 41);
+ EXPECT_EQ(41, i1->get());
delete i1;
}
TEST(EtchShortTest, equals){
EtchShort i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchShortTest, copyTest) {
+ EtchShort o1(2);
+ EtchShort o2(o1);
+ EtchShort o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchShortTest, isInstanceOf) {
+ EtchObject* o1 = new EtchShort(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchShort::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,13 +18,14 @@
#include <gtest/gtest.h>
#include "common/EtchString.h"
+#include "common/EtchInt32.h"
// Tests positive input.
TEST(EtchStringTest, Constructor_Default) {
EtchString* s1 = new EtchString();
EXPECT_TRUE(s1->getObjectType()->equals(EtchString::TYPE()));
- EXPECT_TRUE(s1->c_str() == NULL);
+ EXPECT_EQ(NULL, s1->c_str());
delete s1;
}
@@ -198,4 +199,19 @@ TEST(EtchStringTest, UTF8_substringTest)
status_t result;
result = str1.substring(0, 5, &tmp);
EXPECT_TRUE(result == ETCH_EUNIMPL);
-}
\ No newline at end of file
+}
+TEST(EtchStringTest, copyTest) {
+ EtchString o1("2");
+ EtchString o2(o1);
+ EtchString o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchStringTest, isInstanceOf) {
+ EtchObject* o1 = new EtchString("2");
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchString::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchInt32::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp Wed Oct 17 06:48:53 2012
@@ -208,7 +208,7 @@ public:
}
static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, MyValueFactory &vf) {
- return bytes2msg(buf, length, msg, LEVEL_FULL, vf);
+ bytes2msg(buf, length, msg, LEVEL_FULL, vf);
}
static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, EtchLevel level, MyValueFactory &vf) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp Wed Oct 17 06:48:53 2012
@@ -195,7 +195,7 @@ TEST_F(EtchDefaultValueFactoryTest, expo
EtchStructValue* sv_unknown;
//TRY UNKNOWN VALUE
- capu::SmartPointer<EtchObject> unknown = new EtchObject(EtchObject::TYPE());
+ capu::SmartPointer<EtchObject> unknown = new EtchObject();
EXPECT_TRUE(test->exportCustomValue(unknown, sv_unknown) == ETCH_EINVAL);
//clear the added types
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp Wed Oct 17 06:48:53 2012
@@ -92,7 +92,7 @@ TEST_F(EtchHashTableSerializerTest, init
EtchClass2TypeMap* c2type = new EtchClass2TypeMap();
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
- EtchType* result;
+ EtchType* result = 0;
EXPECT_TRUE(EtchHashTableSerializer::Init(type, c2type) == ETCH_OK);
c2type->get(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), &result);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp Wed Oct 17 06:48:53 2012
@@ -498,3 +498,15 @@ TEST_F(EtchStructValueTest, removeTest)
delete factory;
}
+TEST_F(EtchStructValueTest, isInstanceOf) {
+ EtchString typeName("comp");
+ EtchType* comp = new EtchType(90, typeName);
+ EtchValueFactory* factory = new MockValueFactory_FULL();
+ EtchObject* o1 = new EtchStructValue(comp, factory);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchStructValue::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchInt32::TYPE()));
+ delete o1;
+ delete comp;
+ delete factory;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp Wed Oct 17 06:48:53 2012
@@ -164,3 +164,20 @@ TEST_F(EtchTypeTest, lockTest) {
EXPECT_TRUE(t.getSuperType() == NULL);
delete t2;
}
+
+TEST_F(EtchTypeTest, copyTest) {
+ EtchType o1(EtchString("test"));
+ EtchType o2(o1);
+ EtchType o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST_F(EtchTypeTest, isInstanceOf) {
+ EtchObject* o1 = new EtchType(EtchString("test"));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchType::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp Wed Oct 17 06:48:53 2012
@@ -26,8 +26,8 @@
class MockGeneratedClass : public EtchObject {
public:
- MockGeneratedClass()
- : EtchObject(MockGeneratedClass::TYPE()) {
+ MockGeneratedClass() {
+ addObjectType(MockGeneratedClass::TYPE());
}
virtual ~MockGeneratedClass() {
@@ -144,7 +144,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> integer2 = new EtchInt32(5);
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
-
+
capu::SmartPointer<EtchValidator> ptr = NULL;
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
@@ -165,7 +165,7 @@ TEST_F(EtchValidatorCustomTest, validate
TEST_F(EtchValidatorCustomTest, elementValidatorTest) {
status_t status;
capu::SmartPointer<EtchValidator> ptr = NULL;
-
+
status = EtchValidatorCustom::Get(1, MockGeneratedClass::TYPE(), true, ptr);
EXPECT_EQ(ETCH_OK, status);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp Wed Oct 17 06:48:53 2012
@@ -136,7 +136,7 @@ TEST_F(EtchMessageTest, getTypeTest) {
//Create Value Factory
EtchValueFactory* factory = new MockValueFactory7();
-
+
//create message
EtchMessage *sv = new EtchMessage(comp, factory);
EXPECT_TRUE(sv->getType()->equals(comp));
Author: veithm
Date: Wed Oct 17 06:48:53 2012
New Revision: 1399111
URL: http://svn.apache.org/viewvc?rev=1399111&view=rev
Log:
ETCH-222 Refactored EtchObjectType hierarchy
Change-Id: Ia0df372b9d34e300d7a87537bdc34ec77e291501
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchArrayValue.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchField.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTypeValidator.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPool.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPoolRunnable.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchBool.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDate.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDouble.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchFloat.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchSocket.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchString.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchField.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_cpp.vm Wed Oct 17 06:48:53 2012
@@ -64,13 +64,11 @@ const EtchObjectType* $class::$n.name():
* Constructs the $n.name().
*/
$class::$n.name()::$n.name()()
-#if(!$n.isExcept())
- : EtchObject($class::$n.name()::TYPE())
-#else
- : EtchException("${n.name()}", ETCH_ERROR, EXCPTYPE_USERDEFINED, $class::$n.name()::TYPE())
+#if($n.isExcept())
+ : EtchException("${n.name()}", ETCH_ERROR, EXCPTYPE_USERDEFINED)
#end
{
- //nothing to do!
+ addObjectType($class::$n.name()::TYPE());
}
#if ($n.hasAnyParameters())
/**
@@ -85,16 +83,14 @@ $class::$n.name()::$n.name()()
*/
$class::$n.name()::$n.name()(#set($sep = "")#foreach($i in $n.getAllParameters())$sep$helper.getEtchTypeName($i.type(), true) $i.name() #set( $sep = ", " )#end)
#if($n.hasExtends())
- : $n.name()(#set($sep = "")#foreach($i in $n.getExtends().getAllParameters())$sep$i.name()#set( $sep = ", " ))#end#if(!$n.isExcept()),
- EtchObject($class::$n.name()::TYPE())#end
-#else
-#if(!$n.isExcept())
- : EtchObject($class::$n.name()::TYPE())
+ : $n.name()(#set($sep = "")#foreach($i in $n.getExtends().getAllParameters())$sep$i.name()#set( $sep = ", " ))#end
#else
- : EtchException("${n.name()}", ETCH_ERROR, EXCPTYPE_USERDEFINED, $class::$n.name()::TYPE())
+#if($n.isExcept())
+ : EtchException("${n.name()}", ETCH_ERROR, EXCPTYPE_USERDEFINED)
#end
#end
{
+ addObjectType($class::$n.name()::TYPE());
#foreach( $i in $n.getParameters() )
this->$i.name() = $i.name();
#end
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm Wed Oct 17 06:48:53 2012
@@ -83,9 +83,8 @@ namespace $namespace {
#end
*/
#end
- class $n.name() :
- public EtchObject
- {
+ class $n.name()
+ : public EtchObject {
public:
static const EtchObjectType* TYPE();
enum _eval{
@@ -104,8 +103,13 @@ namespace $namespace {
} Value;
- $n.name()() : EtchObject($n.name()::TYPE()) { }
- $n.name()(_eval eval) : EtchObject($n.name()::TYPE()) { Value = eval; }
+ $n.name()() {
+ addObjectType($n.name()::TYPE());
+ }
+ $n.name()(_eval eval) {
+ addObjectType($n.name()::TYPE());
+ Value = eval;
+ }
};
typedef capu::SmartPointer<$n.name()> $n.name()Ptr;
#end
@@ -218,7 +222,7 @@ namespace $namespace {
#end
class $n.name()
#if($n.hasExtends())
- : public $n.getExtends().name(), public EtchObject
+ : public $n.getExtends().name()
#elseif($n.isExcept())
: public EtchException
#else
@@ -245,9 +249,7 @@ namespace $namespace {
#end
#end
*/
- $n.name()(#set($sep = "")#foreach($i in $n.getAllParameters())$sep$helper.getEtchTypeName($i.type(), true) $i.name() #set( $sep = ", " )#end)#if(!$n.hasExtends());
-#else
- : $n.name();#end
+ $n.name()(#set($sep = "")#foreach($i in $n.getAllParameters())$sep$helper.getEtchTypeName($i.type(), true) $i.name() #set( $sep = ", " )#end);
#end
virtual ~$n.name()() {}
@@ -293,27 +295,20 @@ namespace $namespace {
#end
};
typedef capu::SmartPointer<${n.name()}> $n.name()Ptr;
+ //TODO: we may not be able to serialize NativeArrays of custom user Types!
+ typedef capu::SmartPointer<EtchNativeArray<${n.name()}Ptr> > EtchNativeArray$n.name()Ptr;
#end
#elseif ($n.isBuiltin())
## nothing to do.
#elseif ($n.isEnumx())
typedef capu::SmartPointer<${n.name()}> $n.name()Ptr;
+ typedef capu::SmartPointer<EtchNativeArray<${n.name()}Ptr> > EtchNativeArray$n.name()Ptr;
#else
*** intf.vm: don't know what to do with $n ***
#end
#end
-#foreach($n in $intf.iterator())
-#if ($n.hasAnyParameters())
-#foreach( $i in $n.getAllParameters() )
-#if($i.type().dim() > 0)
- typedef capu::SmartPointer<EtchNativeArray<${n.name()}Ptr> > EtchNativeArray$n.name()Ptr;
- ##typedef EtchNativeArray<${n.name()}Ptr> EtchNativeArray$n.name()Obj;
-#end
-#end
-#end
-#end
};
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm Wed Oct 17 06:48:53 2012
@@ -205,8 +205,6 @@ status_t ${vf}::InitTypes()
status_t ${vf}::InitResults()
{
-//AF: TO-REVIEW: finde die Verwendung von Anonymer Enum bei EchtDirection und bei EtchAsyncMode unschoen
-
#foreach ( $n in $intf.iterator() )
#if ($n.isMessage())
${vf}::${n.vname( $helper )}->setDirection((EtchDirection)$n.msgDir());
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchArrayValue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchArrayValue.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchArrayValue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchArrayValue.h Wed Oct 17 06:48:53 2012
@@ -61,6 +61,13 @@ public:
*/
EtchArrayValue(capu::SmartPointer<EtchNativeArrayBase> array, capu::int32_t size);
+ /**
+ * Constructs an array value copy with no type info. This is used perhaps
+ * by extern struct serializers.
+ * @param other Array Value
+ */
+ EtchArrayValue(const EtchArrayValue& other);
+
virtual ~EtchArrayValue();
/**
@@ -97,6 +104,11 @@ public:
*/
void setIndex(capu::int32_t val);
+ /**
+ * @return true if two object is equal
+ * false otherwise
+ */
+ virtual capu::bool_t equals(const EtchObject * other) const;
/**
* @param index
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h Wed Oct 17 06:48:53 2012
@@ -25,10 +25,17 @@ public:
static const EtchObjectType* TYPE();
- //Default Constructor
+ /**
+ * Constructs a EtchAuthenticationException object.
+ */
EtchAuthenticationException(EtchString &msg);
/**
+ * Constructs a copy of EtchAuthenticationException.
+ */
+ EtchAuthenticationException(const EtchAuthenticationException& other);
+
+ /**
* Destructor
*/
virtual ~EtchAuthenticationException();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchBool.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,11 @@ public:
EtchBool(capu::bool_t value);
/**
+ * Constructs a copy of EtchBool
+ */
+ EtchBool(const EtchBool& other);
+
+ /**
* Sets bool value.
*/
void set(capu::bool_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchByte.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,11 @@ public:
EtchByte(capu::int8_t value);
/**
+ * Constructs a copy of EtchByte.
+ */
+ EtchByte(const EtchByte &value);
+
+ /**
* Sets byte value.
*/
void set(capu::int8_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDate.h Wed Oct 17 06:48:53 2012
@@ -40,6 +40,11 @@ public:
*/
EtchDate(capu::time_t value);
+ /**
+ * Constructs a copy of EtchDate
+ */
+ EtchDate(const EtchDate& other);
+
//Destructor
virtual ~EtchDate();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchDouble.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,11 @@ public:
EtchDouble(capu::double_t value);
/**
+ * Constructs a copy of EtchDouble.
+ */
+ EtchDouble(const EtchDouble& other);
+
+ /**
* Sets double value.
*/
void set(capu::double_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchException.h Wed Oct 17 06:48:53 2012
@@ -34,7 +34,9 @@ public:
};
- //Constructor
+ /**
+ * Constructs a EtchException object.
+ */
EtchException();
/**
@@ -43,7 +45,14 @@ public:
*/
EtchException(EtchString msg, status_t errcode, EtchExceptionType type);
- //destructor
+ /**
+ * Constructs a copy of EtchShort.
+ */
+ EtchException(const EtchException& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchException();
//overridden
@@ -70,18 +79,9 @@ public:
static const EtchObjectType* TYPE();
protected:
-
EtchString mErrorMessage;
status_t mErrorcode;
EtchExceptionType mExcptype;
-
- /**
- * @param msg Message of exception
- * @param errcode Error Code such as ETCH_EINVAL etc.
- * @param type Exception Type such as EXCPTYPE_USERDEFINED etc.
- * @param type_id Typeid of Exception
- */
- EtchException(EtchString msg, status_t errcode, EtchExceptionType type, const EtchObjectType* type_id);
};
#endif /* ETCHEXCEPTION_H */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchFloat.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,11 @@ public:
EtchFloat(capu::float_t value);
/**
+ * Constructs a copy of EtchDouble.
+ */
+ EtchFloat(const EtchFloat& value);
+
+ /**
* Sets float value.
*/
void set(capu::float_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashSet.h Wed Oct 17 06:48:53 2012
@@ -51,6 +51,12 @@ public:
inline EtchHashSet(capu::uint32_t size);
/**
+ * Copy Constructor
+ */
+ inline EtchHashSet(const EtchHashSet& other);
+
+
+ /**
* Destructor
*/
inline ~EtchHashSet();
@@ -103,15 +109,14 @@ private:
};
template <class T, class H, class C>
-inline EtchHashSet<T, H, C>::EtchHashSet()
-: EtchObject(EtchHashSet<T, H, C>::TYPE()) {
-
+inline EtchHashSet<T, H, C>::EtchHashSet() {
+ addObjectType(EtchHashSet<T, H, C>::TYPE());
}
template <class T, class H, class C>
inline EtchHashSet<T, H, C>::EtchHashSet(capu::uint32_t size)
-: EtchObject(&EtchHashSet<T, H, C>::TYPE), mHashSet(size) {
-
+ : mHashSet(size) {
+ addObjectType(EtchHashSet<T, H, C>::TYPE());
}
template <class T, class H, class C>
@@ -121,6 +126,12 @@ const EtchObjectType* EtchHashSet<T, H,
}
template <class T, class H, class C>
+inline EtchHashSet<T, H, C>::EtchHashSet(const EtchHashSet& other)
+ : EtchObject(other), mHashSet(other.mHashSet) {
+
+}
+
+template <class T, class H, class C>
inline EtchHashSet<T, H, C>::~EtchHashSet() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchHashTable.h Wed Oct 17 06:48:53 2012
@@ -51,9 +51,14 @@ public:
inline EtchHashTable(capu::uint32_t size);
/**
+ * Copy Constructor
+ */
+ inline EtchHashTable(const EtchHashTable& other);
+
+ /**
* Destructure.
*/
- inline ~EtchHashTable();
+ inline virtual ~EtchHashTable();
/**
* put a new value to the EtchHashTable.
@@ -109,7 +114,7 @@ public:
* Return iterator for iterating key value tuples.
* @return Iterator
*/
- inline Iterator begin();
+ inline Iterator begin() const;
};
@@ -121,14 +126,19 @@ const EtchObjectType* EtchHashTable<Key,
template <class Key, class T, class H, class C>
inline EtchHashTable<Key, T, H, C>::EtchHashTable()
-: EtchObject(EtchHashTable<Key, T, H, C>::TYPE()), mHashTable(ETCH_DEFAULT_HASH_TABLE_SIZE) {
-
+: mHashTable(ETCH_DEFAULT_HASH_TABLE_SIZE) {
+ addObjectType(EtchHashTable<Key, T, H, C>::TYPE());
}
template <class Key, class T, class H, class C>
inline EtchHashTable<Key, T, H, C>::EtchHashTable(capu::uint32_t size)
-: EtchObject(EtchHashTable<Key, T, H, C>::TYPE()), mHashTable(size) {
+: mHashTable(size) {
+ addObjectType(EtchHashTable<Key, T, H, C>::TYPE());
+}
+template <class Key, class T, class H, class C>
+inline EtchHashTable<Key, T, H, C>::EtchHashTable(const EtchHashTable& other)
+: EtchObject(other), mHashTable(other.mHashTable) {
}
template <class Key, class T, class H, class C>
@@ -162,7 +172,7 @@ inline status_t EtchHashTable<Key, T, H,
}
template <class Key, class T, class H, class C>
-inline typename EtchHashTable<Key, T, H, C>::Iterator EtchHashTable<Key, T, H, C>::begin() {
+inline typename EtchHashTable<Key, T, H, C>::Iterator EtchHashTable<Key, T, H, C>::begin() const {
return mHashTable.begin();
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchInt32.h Wed Oct 17 06:48:53 2012
@@ -20,8 +20,6 @@
#define __ETCHINT32_H__
#include "common/EtchObject.h"
-#include "common/EtchObjectType.h"
-#include "common/EtchError.h"
class EtchInt32 :
public EtchObject {
@@ -45,6 +43,17 @@ public:
EtchInt32(capu::int32_t value);
/**
+ * Constructs a EtchInt32 copy
+ */
+ EtchInt32(const EtchInt32& other);
+
+
+ /**
+ * Destructor.
+ */
+ virtual ~EtchInt32();
+
+ /**
* Sets int32 value.
*/
void set(capu::int32_t value);
@@ -69,7 +78,12 @@ public:
* assigns an integer number to the stored value
*/
capu::int32_t& operator=(capu::int32_t const& other);
-
+
+ /**
+ * assigns an EtchInt32 to an EtchInt32
+ */
+ EtchInt32& operator=(EtchInt32 const& other);
+
/**
* increments and assigns the stored integer value
*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h Wed Oct 17 06:48:53 2012
@@ -45,6 +45,11 @@ public:
EtchList();
/**
+ * Copy Constructor
+ */
+ EtchList(const EtchList& other);
+
+ /**
* Destructor
*/
~EtchList();
@@ -154,11 +159,16 @@ const EtchObjectType* EtchList<T, C>::TY
}
template<class T, class C>
-EtchList<T, C>::EtchList()
-: EtchObject(EtchList<T, C>::TYPE()) {
+EtchList<T, C>::EtchList() {
+ addObjectType(EtchList<T, C>::TYPE());
+}
+template<class T, class C>
+EtchList<T, C>::EtchList(const EtchList& other)
+ : EtchObject(other), mList(other.mList) {
}
+
template<class T, class C>
EtchList<T, C>::~EtchList() {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchLong.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,12 @@ public:
EtchLong(capu::int64_t value);
/**
+ * Constructs a copy of EtchLong.
+ */
+ EtchLong(const EtchLong& other);
+
+
+ /**
* Sets long value.
*/
void set(capu::int64_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchNativeArray.h Wed Oct 17 06:48:53 2012
@@ -341,7 +341,7 @@ public:
//TODO: enhance performance avoiding for-loop-copy
for (capu::int8_t i = 0; i < length; i++) {
mData[pos.pos[index]]->set(i,0,data[i]);
- }
+ }
} else {
//redirect to next sub array
return mData[pos.pos[index]]->set(pos, index+1, data, dataSize, offset, length, written);
@@ -470,8 +470,12 @@ class EtchNativeArrayBase :
public EtchObject {
public:
- EtchNativeArrayBase(const EtchObjectType* type)
- : EtchObject(type) {
+ EtchNativeArrayBase() {
+ }
+
+ EtchNativeArrayBase(const EtchNativeArrayBase& other)
+ : EtchObject(other) {
+
}
/**
@@ -528,6 +532,11 @@ public:
EtchNativeArray(capu::int32_t length, capu::int32_t dim, T* array);
/**
+ * Copy Constructor
+ */
+ EtchNativeArray(const EtchNativeArray& other);
+
+ /**
* Destructor for Etch Nativearray.
* Frees array if content_owned was set.
*/
@@ -609,8 +618,8 @@ const EtchObjectType* EtchNativeArray<T>
}
template<class T>
-EtchNativeArray<T>::EtchNativeArray(capu::int32_t length, capu::int32_t dim)
-: EtchNativeArrayBase(EtchNativeArray<T>::TYPE()) {
+EtchNativeArray<T>::EtchNativeArray(capu::int32_t length, capu::int32_t dim) {
+ addObjectType(EtchNativeArray<T>::TYPE());
if (dim == 1) {
mData = new EtchArrayData<T>(length);
} else {
@@ -619,8 +628,8 @@ EtchNativeArray<T>::EtchNativeArray(capu
}
template<class T>
-EtchNativeArray<T>::EtchNativeArray(capu::int32_t length, capu::int32_t dim, T* array)
-: EtchNativeArrayBase(EtchNativeArray<T>::TYPE()) {
+EtchNativeArray<T>::EtchNativeArray(capu::int32_t length, capu::int32_t dim, T* array) {
+ addObjectType(EtchNativeArray<T>::TYPE());
capu::int32_t bytesWritten;
if (dim == 1) {
mData = new EtchArrayData<T>(length);
@@ -630,7 +639,7 @@ EtchNativeArray<T>::EtchNativeArray(capu
capu::int32_t dimCount = dim;
capu::int32_t offset = 0;
for (capu::int32_t i = 0; i < length; i++) {
- mData->createArray(i, 0, 2,dim-1);
+ mData->createArray(i, 0, 2,dim-1);
mData->set(i, 0, &array[offset], length, 0, length, &bytesWritten);
offset += length;
}
@@ -640,12 +649,17 @@ EtchNativeArray<T>::EtchNativeArray(capu
}
template<class T>
-EtchNativeArray<T>::EtchNativeArray(capu::SmartPointer<EtchArray<T> > array)
-: EtchNativeArrayBase(EtchNativeArray<T>::TYPE()){
+EtchNativeArray<T>::EtchNativeArray(capu::SmartPointer<EtchArray<T> > array) {
+ addObjectType(EtchNativeArray<T>::TYPE());
mData = capu::smartpointer_cast<EtchArrayBase<T> > (array);
}
template<class T>
+EtchNativeArray<T>::EtchNativeArray(const EtchNativeArray& other)
+ : EtchNativeArrayBase(other), mData(other.mData) {
+}
+
+template<class T>
EtchNativeArray<T>::~EtchNativeArray() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h Wed Oct 17 06:48:53 2012
@@ -21,7 +21,7 @@
#include "capu/util/SmartPointer.h"
#include "capu/container/List.h"
-#include "EtchError.h"
+#include "common/EtchError.h"
class EtchObjectType;
@@ -39,9 +39,9 @@ public:
EtchObject();
/**
- * Constructor.
+ * Copy Constructor.
*/
- EtchObject(const EtchObjectType* type);
+ EtchObject(const EtchObject& other);
/**
* Destructor.
@@ -78,11 +78,7 @@ protected:
*/
virtual status_t addObjectType(const EtchObjectType* type);
- // TODO remove me if object hierachy was refactored
- virtual status_t setObjectType(const EtchObjectType* type);
-
private:
- const EtchObjectType* mType;
capu::List<const EtchObjectType*> mTypes;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h Wed Oct 17 06:48:53 2012
@@ -64,6 +64,7 @@ enum EtchObjectTypeIds {
EOTID_AUTH_EXCEPTION,
EOTID_RUNTIME_EXCEPTION,
EOTID_ARRAY_VALUE,
+ EOTID_POOL,
EOTID_FREEPOOL,
EOTID_QUEUEDPOOL,
EOTID_WAIT_UP,
@@ -223,7 +224,7 @@ struct EtchObjectType::__Wrapper__<capu:
static const EtchObjectType* getType() {
return &EtchObjectType::NATIVE_INT16();
}
-
+
static const EtchObjectTypeTrait getTypeTrait() {
return EtchObjectType::VALUE;
}
@@ -286,7 +287,7 @@ struct EtchObjectType::__Wrapper__<capu:
static const EtchObjectType* getType() {
return &EtchObjectType::NATIVE_BOOL();
}
-
+
static const EtchObjectTypeTrait getTypeTrait() {
return EtchObjectType::VALUE;
}
@@ -312,7 +313,7 @@ struct EtchObjectType::__Wrapper__<capu:
static const EtchObjectType* getType() {
return &EtchObjectType::NATIVE_INT16();
}
-
+
static const EtchObjectTypeTrait getTypeTrait() {
return EtchObjectType::POINTER;
}
@@ -402,7 +403,7 @@ struct EtchObjectType::__Wrapper__<capu:
static const EtchObjectType * getType() {
return &EtchObjectType::NATIVE_INT16();
}
-
+
static const EtchObjectTypeTrait getTypeTrait() {
return EtchObjectType::SMART_POINTER;
}
@@ -465,7 +466,7 @@ struct EtchObjectType::__Wrapper__<capu:
static const EtchObjectType * getType() {
return &EtchObjectType::NATIVE_BOOL();
}
-
+
static const EtchObjectTypeTrait getTypeTrait() {
return EtchObjectType::SMART_POINTER;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h Wed Oct 17 06:48:53 2012
@@ -30,10 +30,24 @@ public:
*/
static const EtchObjectType* TYPE();
- //Default Constructor
+ /**
+ * Constructs a EtchRuntimeException object.
+ */
+ EtchRuntimeException();
+
+ /**
+ * EtchRuntimeException
+ * @param msg Exception Message
+ * @param errcode Error Code
+ */
EtchRuntimeException(EtchString msg, status_t errcode);
/**
+ * Constructs a copy of EtchRuntimeException.
+ */
+ EtchRuntimeException(const EtchRuntimeException& other);
+
+ /**
* Destructor
*/
virtual ~EtchRuntimeException();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchServerSocket.h Wed Oct 17 06:48:53 2012
@@ -39,6 +39,11 @@ public:
EtchServerSocket();
/**
+ * Copy Constructor
+ */
+ EtchServerSocket(const EtchServerSocket& other);
+
+ /**
* Destructor
*/
virtual ~EtchServerSocket();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchShort.h Wed Oct 17 06:48:53 2012
@@ -44,6 +44,11 @@ public:
EtchShort(capu::int16_t value);
/**
+ * Constructs a copy of EtchShort.
+ */
+ EtchShort(const EtchShort& value);
+
+ /**
* Sets short value.
*/
void set(capu::int16_t value);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchSocket.h Wed Oct 17 06:48:53 2012
@@ -37,6 +37,12 @@ public:
EtchSocket();
/**
+ * Copy Constructor
+ */
+ EtchSocket(const EtchSocket& other);
+
+
+ /**
* Destructor
*/
~EtchSocket();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchField.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchField.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchField.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchField.h Wed Oct 17 06:48:53 2012
@@ -50,6 +50,17 @@ public:
EtchField(capu::uint32_t id, EtchString & name);
/**
+ * Copy Constructor
+ * @param other
+ */
+ EtchField(const EtchField& other);
+
+ /**
+ * Destructor
+ */
+ virtual ~EtchField();
+
+ /**
* returns the hash code
* @return hash value
*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchHashTableSerializer.h Wed Oct 17 06:48:53 2012
@@ -37,7 +37,7 @@ public:
/**
* Constructor
*/
- EtchHashTableSerializer(EtchType* type, EtchField* field);
+ EtchHashTableSerializer(EtchType* type, EtchField& field);
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchStructValue.h Wed Oct 17 06:48:53 2012
@@ -65,6 +65,11 @@ public:
EtchStructValue(EtchType* type, EtchValueFactory* vf, capu::uint32_t length);
/**
+ * Copy Constructor
+ */
+ EtchStructValue(const EtchStructValue& other);
+
+ /**
* Default Destructor
*/
virtual ~EtchStructValue();
@@ -142,7 +147,7 @@ public:
/**
* @return an iterator which is pointing the beginning of collection
*/
- Iterator begin();
+ Iterator begin() const;
/**
* @return true if the struct value is empty, otherwise false
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h Wed Oct 17 06:48:53 2012
@@ -57,6 +57,11 @@ public:
EtchType(capu::uint32_t id, EtchString name);
/**
+ * Copy Constructor
+ */
+ EtchType(const EtchType& other);
+
+ /**
* Default Destructor
*/
virtual ~EtchType();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTypeValidator.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTypeValidator.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTypeValidator.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchTypeValidator.h Wed Oct 17 06:48:53 2012
@@ -36,6 +36,11 @@ public:
EtchTypeValidator(const EtchObjectType * type, const EtchObjectType* scalarClass, const EtchObjectType* arrayClass, capu::uint32_t nDims, capu::bool_t subclass = false);
/**
+ * Copy Constructor
+ */
+ EtchTypeValidator(const EtchTypeValidator& other);
+
+ /**
* Default Destructor
*/
virtual ~EtchTypeValidator();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidator.h Wed Oct 17 06:48:53 2012
@@ -28,9 +28,12 @@
class EtchValidator : public EtchObject {
public:
- EtchValidator(const EtchObjectType *type)
- : EtchObject(type) {
+ EtchValidator(const EtchObjectType *type) {
+ addObjectType(type);
+ }
+ EtchValidator(const EtchValidator& other)
+ : EtchObject(other) {
}
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorBoolean.h Wed Oct 17 06:48:53 2012
@@ -33,6 +33,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorBoolean(const EtchValidatorBoolean& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorBoolean();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorByte.h Wed Oct 17 06:48:53 2012
@@ -38,6 +38,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorByte(const EtchValidatorByte& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorByte();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorCustom.h Wed Oct 17 06:48:53 2012
@@ -43,6 +43,11 @@ public:
EtchValidatorCustomKey();
/**
+ * Copy Constructor
+ */
+ EtchValidatorCustomKey(const EtchValidatorCustomKey& other);
+
+ /**
* Destructor
*/
virtual ~EtchValidatorCustomKey();
@@ -80,6 +85,8 @@ public:
*/
static const EtchObjectType* TYPE();
+ EtchValidatorCustom(const EtchValidatorCustom& other);
+
/**
* Destructor
*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorDouble.h Wed Oct 17 06:48:53 2012
@@ -35,6 +35,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorDouble(const EtchValidatorDouble& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorDouble();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorFloat.h Wed Oct 17 06:48:53 2012
@@ -35,6 +35,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorFloat(const EtchValidatorFloat& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorFloat();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorInt.h Wed Oct 17 06:48:53 2012
@@ -39,6 +39,17 @@ public:
static const EtchObjectType* TYPE();
/**
+ * Copy Constructor
+ */
+ EtchValidatorInt(const EtchValidatorInt& other);
+
+ /**
+ * Destructor
+ */
+ virtual ~EtchValidatorInt();
+
+
+ /**
* @see EtchValidator
*/
virtual status_t getElementValidator(capu::SmartPointer<EtchValidator> &val);
@@ -58,7 +69,7 @@ public:
*/
static status_t Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val);
- virtual ~EtchValidatorInt();
+
protected:
EtchValidatorInt(capu::uint32_t ndim);
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorLong.h Wed Oct 17 06:48:53 2012
@@ -37,7 +37,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorLong(const EtchValidatorLong& other);
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorLong();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorNone.h Wed Oct 17 06:48:53 2012
@@ -26,6 +26,14 @@ class EtchRuntime;
class EtchValidatorNone : public EtchValidator {
public:
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorNone(const EtchValidatorNone& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorNone();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorObject.h Wed Oct 17 06:48:53 2012
@@ -32,6 +32,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorObject(const EtchValidatorObject& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorObject();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorRuntimeException.h Wed Oct 17 06:48:53 2012
@@ -26,6 +26,14 @@ class EtchRuntime;
class EtchValidatorRuntimeException : public EtchValidator {
public:
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorRuntimeException(const EtchValidatorRuntimeException& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorRuntimeException();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorShort.h Wed Oct 17 06:48:53 2012
@@ -38,6 +38,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorShort(const EtchValidatorShort& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorShort();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorString.h Wed Oct 17 06:48:53 2012
@@ -33,6 +33,14 @@ public:
*/
static const EtchObjectType* TYPE();
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorString(const EtchValidatorString& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorString();
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValidatorStructValue.h Wed Oct 17 06:48:53 2012
@@ -29,6 +29,14 @@ class EtchRuntime;
class EtchValidatorStructValue : public EtchTypeValidator {
public:
+ /**
+ * Copy Constructor
+ */
+ EtchValidatorStructValue(const EtchValidatorStructValue& other);
+
+ /**
+ * Destructor
+ */
virtual ~EtchValidatorStructValue();
/**
@@ -55,7 +63,7 @@ public:
* EtchObjectType for EtchRuntimeException.
*/
static const EtchObjectType* TYPE();
-
+
EtchType* getType();
protected:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchValueFactory.h Wed Oct 17 06:48:53 2012
@@ -51,6 +51,11 @@ public:
EtchValueFactory();
/**
+ * Copy Constructor
+ */
+ EtchValueFactory(const EtchValueFactory& other);
+
+ /**
* Destructor
*/
virtual ~EtchValueFactory() {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPool.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPool.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPool.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPool.h Wed Oct 17 06:48:53 2012
@@ -31,12 +31,24 @@ class EtchPool
public:
/**
+ * EtchObjectType for EtchPool.
+ */
+ static const EtchObjectType* TYPE();
+
+ /**
* Creates a new instance of the EtchPool-Class.
*/
- EtchPool(const EtchObjectType* type)
- : EtchObject(type) {}
+ EtchPool() {
+ addObjectType(TYPE());
+ }
/**
+ * Creates a copy of the EtchPool-Class.
+ */
+ EtchPool(const EtchObject& other)
+ : EtchObject(other) {
+ }
+ /**
* Destructure.
*/
virtual ~EtchPool() {}
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPoolRunnable.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPoolRunnable.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPoolRunnable.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchPoolRunnable.h Wed Oct 17 06:48:53 2012
@@ -36,12 +36,18 @@ public:
virtual status_t run() = 0;
/**
+ * Destructor
+ */
+ virtual ~EtchPoolRunnable() {}
+
+ /**
* Sets an exception
* @param exception that occured
* @return ETCH_OK if no error
*/
status_t setException(capu::SmartPointer<EtchException> exception) {
mException = exception;
+ return ETCH_OK;
}
capu::bool_t hasException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h Wed Oct 17 06:48:53 2012
@@ -30,7 +30,7 @@
/* *
* This class serves as a container for all layers created during the setup of a new stack (connection, packetizer, messagizer, ...).
*/
-class EtchStack : public EtchObject{
+class EtchStack : public EtchObject {
public:
/**
@@ -49,6 +49,12 @@ public:
EtchStack();
/**
+ * Default Constructor
+ */
+ EtchStack(const EtchStack& other);
+
+
+ /**
* Destructor which cleans the whole stack
*/
virtual ~EtchStack();
@@ -87,7 +93,7 @@ public:
* sets the delivery service
*/
void setDeliveryService(EtchDeliveryService* deliveryservice);
-
+
/**
* sets the stub implemenation
*/
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h Wed Oct 17 06:48:53 2012
@@ -38,6 +38,11 @@ public:
EtchStackClient();
/**
+ * Copy Constructor
+ */
+ EtchStackClient(const EtchStackClient& other);
+
+ /**
* Destructor which cleans the whole stack
*/
virtual ~EtchStackClient();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ public:
EtchStackServer();
/**
+ * Copy Constructor
+ */
+ EtchStackServer(const EtchStackServer& other);
+
+ /**
* Destructor which cleans the whole stack
*/
virtual ~EtchStackServer();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubHelper.h Wed Oct 17 06:48:53 2012
@@ -44,11 +44,15 @@ public:
* Constructs a StubHelper which uses synchronous mode to dispatch
* method from message.
*/
- EtchStubHelper()
- : EtchObject(EtchStubHelper::TYPE()) {
+ EtchStubHelper() {
+ addObjectType(TYPE());
// nothing to do.
}
+ EtchStubHelper(const EtchStubHelper& other)
+ : EtchObject(other) {
+ }
+
/**
* Dispatches the method from message.
* @param svc
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchMessage.h Wed Oct 17 06:48:53 2012
@@ -39,6 +39,11 @@ public:
EtchMessage(EtchType *type, EtchValueFactory* vf, capu::uint32_t length);
/**
+ * Copy Constructor
+ */
+ EtchMessage(const EtchMessage& other);
+
+ /**
* Destructor
*/
virtual ~EtchMessage();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTransport.h Wed Oct 17 06:48:53 2012
@@ -161,7 +161,15 @@ public:
* @param maxDelay max delay in milliseconds.
*/
WaitUp(capu::int32_t maxDelay)
- : EtchObject(WaitUp::TYPE()), mMaxDelay(maxDelay) {
+ : mMaxDelay(maxDelay) {
+ addObjectType(TYPE());
+ }
+
+ /**
+ * Copy Constructor
+ */
+ WaitUp(const WaitUp& other)
+ : EtchObject(other), mMaxDelay(other.mMaxDelay) {
}
/**
@@ -184,12 +192,19 @@ public:
return &TYPE;
}
+ /**
+ * Copy Constructor
+ */
+ WaitDown(const WaitDown& other)
+ : EtchObject(other), mMaxDelay(other.mMaxDelay) {
+ }
/**
* @param maxDelay max delay in milliseconds.
*/
WaitDown(capu::int32_t maxDelay)
- : EtchObject(WaitDown::TYPE()), mMaxDelay(maxDelay) {
+ : mMaxDelay(maxDelay) {
+ addObjectType(TYPE());
}
/**
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchArrayValue.cpp Wed Oct 17 06:48:53 2012
@@ -39,13 +39,20 @@ const EtchObjectType* EtchArrayValue::TY
}
EtchArrayValue::EtchArrayValue(capu::SmartPointer<EtchNativeArrayBase> array, capu::int32_t size, capu::int8_t typeCode, EtchType* customStructType, capu::int32_t dim)
-: EtchObject(EtchArrayValue::TYPE()), mArray(array), mTypeCode(typeCode),
+: mArray(array), mTypeCode(typeCode),
mCustomStructType(customStructType), mDim(dim), mAddIndex(size), mSize(size) {
+ addObjectType(TYPE());
}
EtchArrayValue::EtchArrayValue(capu::SmartPointer<EtchNativeArrayBase> array, capu::int32_t size)
-: EtchObject(EtchArrayValue::TYPE()), mArray(array), mTypeCode(0),
+: mArray(array), mTypeCode(0),
mCustomStructType(NULL), mDim(1), mAddIndex(size), mSize(size) {
+ addObjectType(TYPE());
+}
+
+EtchArrayValue::EtchArrayValue(const EtchArrayValue& other)
+ : EtchObject(other), mArray(other.mArray), mTypeCode(other.mTypeCode), mCustomStructType(other.mCustomStructType),
+ mDim(other.mDim), mAddIndex(other.mAddIndex), mSize(other.mSize) {
}
EtchArrayValue::~EtchArrayValue() {
@@ -80,6 +87,25 @@ EtchType * EtchArrayValue::getCustomStru
return mCustomStructType;
}
+capu::bool_t EtchArrayValue::equals(const EtchObject* other) const {
+ if(other == NULL)
+ return false;
+ if(!other->isInstanceOf(TYPE()))
+ return false;
+ EtchArrayValue* value = (EtchArrayValue*) other;
+
+ capu::bool_t customTypeTest = false;
+ if(mCustomStructType == NULL)
+ customTypeTest = mCustomStructType == value->mCustomStructType;
+ else
+ customTypeTest = this->mCustomStructType->equals(value->mCustomStructType);
+
+ if(customTypeTest && this->mArray->isInstanceOf(value->mArray->TYPE())
+ && this->mSize == value->mSize && this->mDim == value->mDim && this->mAddIndex == value->mAddIndex)
+ return true;
+ return false;
+}
+
status_t EtchArrayValue::get(capu::uint32_t index, capu::SmartPointer<EtchObject> &result) {
if ((index >= getSize()) || (mArray.get() == NULL)) {
return ETCH_EINVAL;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp Wed Oct 17 06:48:53 2012
@@ -23,8 +23,12 @@ const EtchObjectType* EtchAuthentication
}
EtchAuthenticationException::EtchAuthenticationException(EtchString& msg)
-: EtchException(msg, ETCH_ERROR, EXCPTYPE_BUILTIN, EtchAuthenticationException::TYPE()) {
+: EtchException(msg, ETCH_ERROR, EXCPTYPE_BUILTIN) {
+ addObjectType(TYPE());
+}
+EtchAuthenticationException::EtchAuthenticationException(const EtchAuthenticationException& other)
+: EtchException(other) {
}
EtchAuthenticationException::~EtchAuthenticationException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchBool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchBool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchBool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchBool.cpp Wed Oct 17 06:48:53 2012
@@ -24,16 +24,20 @@ const EtchObjectType* EtchBool::TYPE() {
}
EtchBool::EtchBool()
-: EtchObject(EtchBool::TYPE())
-, mValue(false){
-
+: mValue(false){
+ addObjectType(TYPE());
}
EtchBool::EtchBool(capu::bool_t value)
-: EtchObject(EtchBool::TYPE())
-, mValue(value){
+ : mValue(value){
+ addObjectType(TYPE());
+}
+
+EtchBool::EtchBool(const EtchBool& other)
+ : EtchObject(other), mValue(other.mValue) {
}
+
void EtchBool::set(capu::bool_t value){
mValue = value;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchByte.cpp Wed Oct 17 06:48:53 2012
@@ -24,13 +24,17 @@ const EtchObjectType* EtchByte::TYPE() {
}
EtchByte::EtchByte()
-: EtchObject(EtchByte::TYPE())
-, mValue(0){
+: mValue(0) {
+ addObjectType(TYPE());
}
EtchByte::EtchByte(capu::int8_t value)
-: EtchObject(EtchByte::TYPE())
-, mValue(value){
+: mValue(value) {
+ addObjectType(TYPE());
+}
+
+EtchByte::EtchByte(const EtchByte &other)
+ : EtchObject(other), mValue(other.mValue) {
}
void EtchByte::set(capu::int8_t value){
@@ -52,6 +56,6 @@ capu::bool_t EtchByte::equals(const Etch
capu::uint32_t EtchByte::getHashCode() const{
//For better distribution
- capu::uint32_t result = mValue + 128;
+ capu::uint32_t result = mValue + 128;
return result;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDate.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDate.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDate.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDate.cpp Wed Oct 17 06:48:53 2012
@@ -24,11 +24,18 @@ const EtchObjectType* EtchDate::TYPE() {
}
EtchDate::EtchDate()
-: EtchObject(EtchDate::TYPE()), mValue(0) {
+: mValue(0) {
+ addObjectType(TYPE());
}
EtchDate::EtchDate(capu::time_t value)
-: EtchObject(EtchDate::TYPE()), mValue(value) {
+ : mValue(value) {
+ addObjectType(TYPE());
+}
+
+
+EtchDate::EtchDate(const EtchDate& other)
+ : EtchObject(other), mValue(other.mValue) {
}
EtchDate::~EtchDate() {
@@ -54,5 +61,5 @@ void EtchDate::set(capu::time_t value) {
}
capu::uint32_t EtchDate::getHashCode() const{
- return static_cast<capu::uint32_t>(mValue ^ mValue >> 32);;
-}
\ No newline at end of file
+ return static_cast<capu::uint32_t>(mValue ^ mValue >> 32);
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDouble.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDouble.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDouble.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchDouble.cpp Wed Oct 17 06:48:53 2012
@@ -24,13 +24,17 @@ const EtchObjectType* EtchDouble::TYPE()
}
EtchDouble::EtchDouble()
-: EtchObject(EtchDouble::TYPE())
-, mValue(0.0L){
+: mValue(0.0L) {
+ addObjectType(TYPE());
}
EtchDouble::EtchDouble(capu::double_t value)
-: EtchObject(EtchDouble::TYPE())
-, mValue(value){
+: mValue(value) {
+ addObjectType(TYPE());
+}
+
+EtchDouble::EtchDouble(const EtchDouble& other)
+ : EtchObject(other), mValue(other.mValue) {
}
void EtchDouble::set(capu::double_t value){
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp Wed Oct 17 06:48:53 2012
@@ -24,21 +24,16 @@ const EtchObjectType* EtchException::TYP
EtchException::EtchException()
: EtchObject(), mErrorMessage(""), mErrorcode(0), mExcptype(0) {
- EtchObject::addObjectType(EtchException::TYPE());
- // TODO change object hierachy
- EtchObject::setObjectType(EtchException::TYPE());
+ addObjectType(EtchException::TYPE());
}
EtchException::EtchException(EtchString msg, status_t errcode, EtchExceptionType type)
: EtchObject(), mErrorMessage(msg), mErrorcode(errcode), mExcptype(type) {
- EtchObject::addObjectType(EtchException::TYPE());
- // TODO change object hierachy
- EtchObject::setObjectType(EtchException::TYPE());
+ addObjectType(EtchException::TYPE());
}
-EtchException::EtchException(EtchString msg, status_t errcode, EtchExceptionType type, const EtchObjectType* type_id)
-: EtchObject(type_id), mErrorMessage(msg), mErrorcode(errcode), mExcptype(type) {
-
+EtchException::EtchException(const EtchException& other)
+ : EtchObject(other), mErrorMessage(other.mErrorMessage), mErrorcode(other.mErrorcode), mExcptype(other.mExcptype) {
}
EtchException::~EtchException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchFloat.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchFloat.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchFloat.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchFloat.cpp Wed Oct 17 06:48:53 2012
@@ -24,13 +24,17 @@ const EtchObjectType* EtchFloat::TYPE()
}
EtchFloat::EtchFloat()
-: EtchObject(EtchFloat::TYPE())
-, mValue(0.0f){
+ : mValue(0.0f) {
+ addObjectType(TYPE());
}
EtchFloat::EtchFloat(capu::float_t value)
-: EtchObject(EtchFloat::TYPE())
-, mValue(value){
+ : mValue(value) {
+ addObjectType(TYPE());
+}
+
+EtchFloat::EtchFloat(const EtchFloat& other)
+ : EtchObject(other), mValue(other.mValue) {
}
void EtchFloat::set(capu::float_t value){
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchInt32.cpp Wed Oct 17 06:48:53 2012
@@ -17,6 +17,8 @@
*/
#include "common/EtchInt32.h"
+#include "common/EtchObjectType.h"
+#include "common/EtchError.h"
const EtchObjectType* EtchInt32::TYPE() {
const static EtchObjectType TYPE(EOTID_INT32, NULL);
@@ -24,15 +26,23 @@ const EtchObjectType* EtchInt32::TYPE()
}
EtchInt32::EtchInt32()
-: EtchObject(EtchInt32::TYPE())
-, mValue(0){
+ : mValue(0) {
+ addObjectType(TYPE());
}
EtchInt32::EtchInt32(capu::int32_t value)
-: EtchObject(EtchInt32::TYPE())
-, mValue(value){
+ : mValue(value) {
+ addObjectType(TYPE());
}
+EtchInt32::EtchInt32(const EtchInt32& other)
+ : EtchObject(other), mValue(other.mValue) {
+}
+
+EtchInt32::~EtchInt32() {
+}
+
+
void EtchInt32::set(capu::int32_t value){
mValue = value;
}
@@ -63,6 +73,15 @@ capu::int32_t& EtchInt32::operator=(capu
return mValue;
}
+EtchInt32& EtchInt32::operator=(EtchInt32 const& other)
+{
+ if(mValue != other.mValue)
+ {
+ mValue = other.mValue;
+ }
+ return *this;
+}
+
capu::int32_t& EtchInt32::operator++() //pre increment
{
++mValue;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchLong.cpp Wed Oct 17 06:48:53 2012
@@ -24,29 +24,33 @@ const EtchObjectType* EtchLong::TYPE() {
}
EtchLong::EtchLong()
-: EtchObject(EtchLong::TYPE())
-, mValue(0){
+ : mValue(0) {
+ addObjectType(TYPE());
}
EtchLong::EtchLong(capu::int64_t value)
-: EtchObject(EtchLong::TYPE())
-, mValue(value){
+ : mValue(value) {
+ addObjectType(TYPE());
}
-void EtchLong::set(capu::int64_t value){
+EtchLong::EtchLong(const EtchLong& other)
+ : EtchObject(other), mValue(other.mValue) {
+}
+
+void EtchLong::set(capu::int64_t value) {
mValue = value;
}
-capu::int64_t EtchLong::get(){
+capu::int64_t EtchLong::get() {
return mValue;
}
-capu::uint32_t EtchLong::getHashCode() const{
+capu::uint32_t EtchLong::getHashCode() const {
//first 32 bit xor second 32 bit of long
return static_cast<capu::uint32_t>(mValue ^ mValue >> 32);
}
-capu::bool_t EtchLong::equals(const EtchObject * other) const{
+capu::bool_t EtchLong::equals(const EtchObject * other) const {
if (other == NULL)
return false;
else if (!other->getObjectType()->equals(EtchLong::TYPE()))
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchObject.cpp Wed Oct 17 06:48:53 2012
@@ -24,20 +24,21 @@ const EtchObjectType* EtchObject::TYPE()
return &TYPE;
}
-EtchObject::EtchObject()
- : mType(TYPE()) {
+EtchObject::EtchObject() {
addObjectType(TYPE());
}
-EtchObject::EtchObject(const EtchObjectType* type){
- mType = type;
+EtchObject::EtchObject(const EtchObject& other)
+ : mTypes(other.mTypes) {
}
-EtchObject::~EtchObject() {
+const EtchObjectType* EtchObject::getObjectType() const {
+ const EtchObjectType* ret;
+ this->mTypes.get(mTypes.size()-1, &ret);
+ return ret;
}
-const EtchObjectType* EtchObject::getObjectType() const{
- return mType;
+EtchObject::~EtchObject() {
}
capu::bool_t EtchObject::isInstanceOf(const EtchObjectType* type) const {
@@ -64,9 +65,3 @@ status_t EtchObject::addObjectType(const
mTypes.add(type);
return ETCH_OK;
}
-
-status_t EtchObject::setObjectType(const EtchObjectType* type) {
- mType = type;
- return ETCH_OK;
-}
-
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp Wed Oct 17 06:48:53 2012
@@ -25,8 +25,12 @@ const EtchObjectType* EtchRuntimeExcepti
EtchRuntimeException::EtchRuntimeException(EtchString msg, status_t errcode)
-: EtchException(msg, errcode, EtchException::EXCPTYPE_BUILTIN, EtchRuntimeException::TYPE()) {
+: EtchException(msg, errcode, EtchException::EXCPTYPE_BUILTIN) {
+ addObjectType(TYPE());
+}
+EtchRuntimeException::EtchRuntimeException(const EtchRuntimeException& other)
+: EtchException(other) {
}
EtchRuntimeException::~EtchRuntimeException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchServerSocket.cpp Wed Oct 17 06:48:53 2012
@@ -24,9 +24,13 @@ const EtchObjectType* EtchServerSocket::
return &TYPE;
}
-EtchServerSocket::EtchServerSocket()
-: EtchObject(EtchServerSocket::TYPE()) {
+EtchServerSocket::EtchServerSocket() {
+ addObjectType(TYPE());
+}
+
+EtchServerSocket::EtchServerSocket(const EtchServerSocket& other)
+ : EtchObject(other) {
}
EtchServerSocket::~EtchServerSocket() {
@@ -52,4 +56,4 @@ EtchSocket* EtchServerSocket::accept() {
status_t EtchServerSocket::bind(capu::uint16_t port, const char* addr)
{
return mServerSocket.bind(port,addr);
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchShort.cpp Wed Oct 17 06:48:53 2012
@@ -24,30 +24,34 @@ const EtchObjectType* EtchShort::TYPE()
}
EtchShort::EtchShort()
-: EtchObject(EtchShort::TYPE())
-, mValue(0){
+ : mValue(0) {
+ addObjectType(TYPE());
}
EtchShort::EtchShort(capu::int16_t value)
-: EtchObject(EtchShort::TYPE())
-, mValue(value){
+ : mValue(value) {
+ addObjectType(TYPE());
}
-void EtchShort::set(capu::int16_t value){
+EtchShort::EtchShort(const EtchShort& other)
+ : EtchObject(other), mValue(other.mValue) {
+}
+
+void EtchShort::set(capu::int16_t value) {
mValue = value;
}
-capu::int16_t EtchShort::get(){
+capu::int16_t EtchShort::get() {
return mValue;
}
-capu::uint32_t EtchShort::getHashCode() const{
+capu::uint32_t EtchShort::getHashCode() const {
//for better distribution
capu::uint32_t result = mValue + 32768;
return result;
}
-capu::bool_t EtchShort::equals(const EtchObject * other) const{
+capu::bool_t EtchShort::equals(const EtchObject * other) const {
if (other == NULL)
return false;
else if (!other->getObjectType()->equals(EtchShort::TYPE()))
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchSocket.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchSocket.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchSocket.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchSocket.cpp Wed Oct 17 06:48:53 2012
@@ -23,19 +23,23 @@ const EtchObjectType* EtchSocket::TYPE()
return &TYPE;
}
-EtchSocket::EtchSocket()
-: EtchObject(EtchSocket::TYPE()) {
+EtchSocket::EtchSocket() {
+ addObjectType(TYPE());
mSocket = new capu::Socket();
}
-EtchSocket::EtchSocket(capu::Socket* soc)
-: EtchObject(EtchSocket::TYPE()) {
+EtchSocket::EtchSocket(capu::Socket* soc) {
+ addObjectType(TYPE());
if (soc == NULL)
mSocket = new capu::Socket();
else
mSocket = soc;
}
+EtchSocket::EtchSocket(const EtchSocket& other)
+ : EtchObject(other), mSocket(other.mSocket) {
+}
+
EtchSocket::~EtchSocket() {
delete mSocket;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchString.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchString.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchString.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchString.cpp Wed Oct 17 06:48:53 2012
@@ -31,13 +31,13 @@ const EtchObjectType* EtchString::TYPE()
// TODO: String should support UTF-8 by default
EtchString::EtchString()
-: EtchObject(EtchString::TYPE())
-, mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
+ : mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
+ addObjectType(TYPE());
}
EtchString::EtchString(const char* string)
-: EtchObject(EtchString::TYPE())
-, mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
+ : mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
+ addObjectType(TYPE());
if (string != NULL) {
capu::uint32_t len = capu::StringUtils::Strlen(string);
mData = new char[len + 1];
@@ -47,9 +47,8 @@ EtchString::EtchString(const char* strin
}
EtchString::EtchString(const capu::int8_t* buffer, const capu::int32_t bufferSize, EtchString encoding)
-: EtchObject(EtchString::TYPE())
-, mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
-
+: mData(NULL), mDataSize(0), mEncoding(ENCODING_ASCII) {
+ addObjectType(TYPE());
EtchString enc("utf-8");
if (encoding.equals(&enc)) {
mEncoding = ENCODING_UTF8;
@@ -73,7 +72,7 @@ EtchString::EtchString(const capu::int8_
}
EtchString::EtchString(const EtchString ©)
-: EtchObject(EtchString::TYPE()), mDataSize(copy.mDataSize), mEncoding(copy.mEncoding) {
+: EtchObject(copy), mDataSize(copy.mDataSize), mEncoding(copy.mEncoding) {
if (copy.mData == NULL)
return;
if (mEncoding != ENCODING_UTF8) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchField.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchField.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchField.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchField.cpp Wed Oct 17 06:48:53 2012
@@ -26,16 +26,26 @@ const EtchObjectType* EtchField::TYPE()
}
EtchField::EtchField(capu::uint32_t id, EtchString& name)
-: EtchObject(EtchField::TYPE()), mId(id), mName(name) {
+ : mId(id), mName(name) {
+ addObjectType(EtchField::TYPE());
}
EtchField::EtchField(const EtchString& name)
-: EtchObject(EtchField::TYPE()), mId(0), mName(name) {
+ : mId(0), mName(name) {
+ addObjectType(EtchField::TYPE());
mId = EtchHashEx::Digest(name);
}
EtchField::EtchField()
-: EtchObject(EtchField::TYPE()), mId(0), mName("") {
+ : mId(0), mName("") {
+ addObjectType(EtchField::TYPE());
+}
+
+EtchField::~EtchField() {
+}
+
+EtchField::EtchField(const EtchField& other)
+ : EtchObject(other), mId(other.mId), mName(other.mName) {
}
capu::uint32_t EtchField::getHashCode() const{
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp Wed Oct 17 06:48:53 2012
@@ -27,8 +27,8 @@ const EtchString& EtchHashTableSerialize
return name;
}
-EtchHashTableSerializer::EtchHashTableSerializer(EtchType* type, EtchField* field)
-: mField(*field), mType(type) {
+EtchHashTableSerializer::EtchHashTableSerializer(EtchType* type, EtchField& field)
+: mField(field), mType(type) {
//TODO refactoring
mRuntime = EtchRuntime::getRuntime();
}
@@ -109,17 +109,17 @@ status_t EtchHashTableSerializer::Init(E
if (result != ETCH_OK) {
return result;
}
-
+
result = class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
if (result != ETCH_OK) {
return result;
}
-
+
type->setComponentType(EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >::TYPE());
-
+
//set the import export helper
- type->setImportExportHelper(new EtchHashTableSerializer(type, &field));
-
+ type->setImportExportHelper(new EtchHashTableSerializer(type, field));
+
//get validator
capu::SmartPointer<EtchValidator> tmp;
result = EtchValidatorObject::Get(1, tmp);
Author: veithm
Date: Wed Oct 17 06:48:21 2012
New Revision: 1399110
URL: http://svn.apache.org/viewvc?rev=1399110&view=rev
Log:
ETCH-250 List refactoring
Change-Id: If3d671e67bfeaa70ee310f0f7a7ee5000122ff74
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashSet.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashTable.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/List.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/test/container/ListTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchComparator.h Wed Oct 17 06:48:21 2012
@@ -26,12 +26,12 @@ template <class T>
class EtchComparator {
public:
- inline capu::bool_t operator() (const EtchObject &first, const EtchObject &second) {
+ inline capu::bool_t operator() (const EtchObject &first, const EtchObject &second) const {
return first.equals(&second);
}
- inline capu::bool_t operator() (const EtchObjectType &first, const EtchObjectType &second) {
- return first.equals(&second);
+ inline capu::bool_t operator() (const EtchObjectType &first, const EtchObjectType &second) const {
+ return first.equals(&second);
}
};
@@ -39,11 +39,11 @@ template <class T>
class EtchComparator <T*> {
public:
- inline capu::bool_t operator() (const EtchObject* first, const EtchObject* second) {
+ inline capu::bool_t operator() (const EtchObject* first, const EtchObject* second) const {
return first->equals(second);
}
- inline capu::bool_t operator() (const EtchObjectType* first, const EtchObjectType* second) {
+ inline capu::bool_t operator() (const EtchObjectType* first, const EtchObjectType* second) const {
return first->equals(second);
}
};
@@ -52,11 +52,11 @@ template <class T>
class EtchComparator <capu::SmartPointer<T> > {
public:
- inline capu::bool_t operator() (const capu::SmartPointer<EtchObject>& first, const capu::SmartPointer<EtchObject>& second) {
+ inline capu::bool_t operator() (const capu::SmartPointer<EtchObject>& first, const capu::SmartPointer<EtchObject>& second) const {
return first->equals(second.get());
}
- inline capu::bool_t operator() (const capu::SmartPointer<EtchObjectType>& first, const capu::SmartPointer<EtchObjectType>& second) {
+ inline capu::bool_t operator() (const capu::SmartPointer<EtchObjectType>& first, const capu::SmartPointer<EtchObjectType>& second) const {
return first->equals(second.get());
}
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchList.h Wed Oct 17 06:48:21 2012
@@ -100,13 +100,13 @@ public:
* @return true if empty
* false otherwise
*/
- capu::bool_t isEmpty();
+ capu::bool_t isEmpty() const;
/**
* returns an iterator pointing to the beginning of list
* @return iterator
*/
- Iterator begin();
+ Iterator begin() const;
/**
* finds the index of given element in the link list
@@ -116,7 +116,7 @@ public:
* @return -1 if the value either does not exist or given value is NULL
* otherwise index of value on linked list
*/
- capu::int32_t find(const T &element);
+ capu::int32_t find(const T &element) const;
/**
*
@@ -175,7 +175,7 @@ status_t EtchList<T, C>::add(capu::int32
}
template<class T, class C>
-typename EtchList<T, C>::Iterator EtchList<T, C>::begin() {
+typename EtchList<T, C>::Iterator EtchList<T, C>::begin() const {
return mList.begin();
}
@@ -190,7 +190,7 @@ capu::bool_t EtchList<T, C>::contains(co
}
template<class T, class C>
-capu::int32_t EtchList<T, C>::find(const T &element) {
+capu::int32_t EtchList<T, C>::find(const T &element) const {
return mList.find(element);
}
@@ -200,7 +200,7 @@ status_t EtchList<T, C>::get(capu::int32
}
template<class T, class C>
-capu::bool_t EtchList<T, C>::isEmpty() {
+capu::bool_t EtchList<T, C>::isEmpty() const {
return mList.isEmpty();
}
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashSet.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashSet.h?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashSet.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashSet.h Wed Oct 17 06:48:21 2012
@@ -237,7 +237,7 @@ namespace capu {
return CAPU_OK;
}
-
+
template <class T, class C, class H>
bool_t HashSet< T, C, H>::hasElement(const T &value) {
uint_t index = H::Digest(value) % mSize;
@@ -266,12 +266,8 @@ namespace capu {
}
template <class T, class C, class H>
- HashSet< T, C, H>::HashSetIterator::HashSetIterator(List<T, C> * list, uint_t list_size) {
- mCurrentListIndex = 0;
- this->mList = list;
- mMaxListSize = list_size;
- this->mCurrentListIterator = list[mCurrentListIndex].begin();
-
+ HashSet< T, C, H>::HashSetIterator::HashSetIterator(List<T, C> * list, uint_t list_size)
+ : mCurrentListIndex(0), mCurrentListIterator(list[0].begin()), mList(list), mMaxListSize(list_size) {
//to point the first non-empty one
for (uint_t i = 0; i < list_size; ++i) {
if (!mList[i].isEmpty()) {
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashTable.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashTable.h?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashTable.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/HashTable.h Wed Oct 17 06:48:21 2012
@@ -84,6 +84,12 @@ namespace capu {
*/
HashTable(uint_t size);
+
+ /**
+ * Constructs a copy of HashTable.
+ */
+ HashTable(const HashTable& other);
+
/**
* Destructure.
*/
@@ -111,7 +117,7 @@ namespace capu {
* CAPU_EINVAL if value is null
* CAPU_ENOT_EXIST if there is no pair with specified key
*/
- status_t get(const Key &key, T* value);
+ status_t get(const Key &key, T* value) const;
/**
* Remove value associated with key in the hashtable.
@@ -143,7 +149,7 @@ namespace capu {
* Return iterator for iterating key value tuples.
* @return Iterator
*/
- Iterator begin();
+ Iterator begin() const;
private:
@@ -155,7 +161,7 @@ namespace capu {
* @return -1 if the key is unique
* otherwise the index in the linked list
*/
- int_t getKeyIndexFromBucket(uint_t index, const Key &k) {
+ int_t getKeyIndexFromBucket(uint_t index, const Key &k) const {
int_t count = 0;
typename List<Pair<Key, T> >::Iterator it = mLists[index].begin();
Pair<Key, T> pair;
@@ -179,8 +185,7 @@ namespace capu {
template <class Key, class T, class C, class Hash>
HashTable<Key, T, C, Hash>::HashTable()
- : mSize(HASH_TABLE_DEFAULT_SIZE)
- , mCount(0) {
+ : mSize(HASH_TABLE_DEFAULT_SIZE), mCount(0) {
mLists = new List<Pair<Key, T>, Comparator >[mSize];
}
@@ -196,6 +201,19 @@ namespace capu {
}
template <class Key, class T, class C, class Hash>
+ HashTable<Key, T, C, Hash>::HashTable(const HashTable& other)
+ : mSize(other.mSize), mCount(0) {
+ mLists = new List<Pair<Key, T>, Comparator >[mSize];
+ typename HashTable<Key, T, C, Hash>::Iterator iterator = other.begin();
+ Pair<Key, T> pair;
+ while(iterator.hasNext())
+ {
+ iterator.next(&pair);
+ put(pair.first, pair.second, NULL);
+ }
+ }
+
+ template <class Key, class T, class C, class Hash>
HashTable<Key, T, C, Hash>::~HashTable() {
delete [] mLists;
}
@@ -245,7 +263,7 @@ namespace capu {
}
template <class Key, class T, class C, class Hash>
- status_t HashTable<Key, T, C, Hash>::get(const Key &key, T* value) {
+ status_t HashTable<Key, T, C, Hash>::get(const Key &key, T* value) const {
if (value == NULL)
return CAPU_EINVAL;
@@ -312,17 +330,13 @@ namespace capu {
}
template <class Key, class T, class C, class Hash>
- typename HashTable<Key, T, C, Hash>::Iterator HashTable<Key, T, C, Hash>::begin() {
+ typename HashTable<Key, T, C, Hash>::Iterator HashTable<Key, T, C, Hash>::begin() const {
return typename HashTable<Key, T, C, Hash>::Iterator(mLists, mSize);
}
template <class Key, class T, class C, class Hash>
- HashTable<Key, T, C, Hash>::HashTableIterator::HashTableIterator(List<Pair<Key, T> > * list, uint_t list_size) {
- mCurrentListIndex = 0;
- this->mList = list;
- mMaxListSize = list_size;
- this->mCurrentListIterator = list[mCurrentListIndex].begin();
-
+ HashTable<Key, T, C, Hash>::HashTableIterator::HashTableIterator(List<Pair<Key, T> > * list, uint_t list_size)
+ : mCurrentListIndex(0), mCurrentListIterator(list[0].begin()), mList(list), mMaxListSize(list_size) {
//to point the first non-empty one
for (uint_t i = 0; i < list_size; ++i) {
if (!mList[i].isEmpty()) {
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/List.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/List.h?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/List.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/container/List.h Wed Oct 17 06:48:21 2012
@@ -1,593 +1,570 @@
/* $Id$
- *
- * 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.
- */
+*
+* 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.
+*/
+
+#ifndef __List_H__
+#define __List_H__
-#ifndef __LIST_H__
-#define __LIST_H__
#include "capu/Error.h"
#include "capu/Config.h"
#include "capu/container/Comparator.h"
-namespace capu {
-
- template <class T, class C = Comparator >
- class List {
+namespace capu
+{
+ template <class T, class C = Comparator>
+ class List
+ {
+ private:
+ class ListNode
+ {
+ public:
+
+ ListNode()
+ : mNext(0)
+ , mPrev(0)
+ {
+ }
+
+ ListNode(const T& data)
+ : mData(data)
+ , mNext(0)
+ , mPrev(0)
+ {
+ }
+
+ T mData;
+ ListNode* mNext;
+ ListNode* mPrev;
+ };
+
+ class ListIterator
+ {
+ public:
+ friend class List<T, C>;
+
+ /**
+ * destructor
+ */
+ ~ListIterator();
+
+ /**
+ * Check if iterator has next element.
+ * @return false if the next of current node that is pointed, is null otherwise true
+ */
+ bool_t hasNext();
+
+ /**
+ * Shifts the iterator to the next position and returns the element if next != NULL
+ * @param element
+ * @return CAPU_OK if the next element has been gotten
+ *
+ */
+ status_t next(T* element = 0);
+
+ /**
+ * Get current iterator element.
+ * @param element
+ * @return CAPU_OK if the current element has been gotten
+ */
+ status_t current(T* element);
+
+ /**
+ * Returns the index of the current element.
+ * @return The index of the current element. If there is no current element, the return value is undefined.
+ */
+ uint32_t currentIndex();
+
+ private:
+ ListIterator(ListNode* boundary); // creation only in list.begin()
+ ListNode* mInitialNode;
+ ListNode* mCurrentNode;
+ uint32_t mIndex;
+ };
+
+ ListNode* mBoundary;
+ uint_t mSize;
+ C mComparator;
+
+ void insertElement(ListNode* addPosition, const T& element);
+ void deleteElement(ListNode* deletePosition);
+ ListNode* findElement(uint_t index) const;
+
+ public:
+ typedef typename List<T, C>::ListIterator Iterator;
+
+ /**
+ * Default Constructor
+ */
+ List();
+
+ /**
+ * Copy constructor
+ */
+ List(const List<T, C>& other);
+
+ /**
+ * Destructor
+ */
+ virtual ~List();
+
+
+ List<T,C>& operator=(List<T, C> const& other);
+
+ /**
+ * Add element to the end of list
+ * @param element element that will be added
+ * @return CAPU_ENO_MEMORY if allocation of element is failed
+ * CAPU_OK if the element is successfully added
+ */
+ status_t add(const T& element);
+
+ /**
+ * Add element to specified position
+ *
+ * @param index index of element which will be inserted
+ * @param element new value that will replace the old value
+ *
+ * @return CAPU_EINVAL if given index is invalid.
+ * CAPU_ENO_MEMORY if allocation of element is failed
+ * CAPU_OK if the element is successfully added
+ * CAPU_ERROR otherwise
+ */
+ status_t add(uint_t index, const T& element);
+
+ /**
+ * Add element to specified position
+ *
+ * @param iterator with the position to insert
+ * @param element new value that will replace the old value
+ *
+ * @return CAPU_ENO_MEMORY memory allocation failed.
+ * CAPU_OK otherwise
+ */
+ status_t add(Iterator& iter, const T &element);
+
+ /**
+ * Sets the element at the specified index.
+ * @param index the index of element that will be replaced
+ * @param element element that will be overwritten to existing place
+ * @param elementOld the buffer to keep the existing
+ * @return CAPU_EINVAL if the index is not valid
+ * CAPU_OK otherwise
+ */
+ status_t set(uint_t index, const T &element, T* elementOld = 0);
+
+ /**
+ * remove the element in the specified index and if the element_old
+ * parameter is not NULL, the removed element will be put to element_old
+ * @param index index of element that will be removed
+ * @param elementOld the buffer which will keep the copy of the removed element
+ * @return CAPU_EINVAL invalid index
+ * CAPU_OK if the element is successfully removed
+ */
+ status_t removeAt(uint_t index, T* elementOld = 0);
+
+ /**
+ * remove the element in the specified iterator position and if the element_old
+ * parameter is not NULL, the removed element will be put to element_old
+ * @param iterator of element that will be removed
+ * @param element_old the buffer which will keep the copy of the removed element
+ * @return CAPU_EINVAL invalid iterator
+ * CAPU_OK if the element is successfully removed
+ *
+ */
+ status_t removeAt(Iterator& listIterator, T* elementOld = 0);
+
+ /**
+ * Removes an element.
+ * @param element The element that will get removed.
+ * @return CAPU_EINVAL if element was not found
+ * CAPU_OK if element was removed.
+ */
+ status_t remove(const T& element);
+
+ /**
+ * removes all elements from linked list
+ *
+ * @return CAPU_OK if all of the elements are deleted
+ */
+ status_t clear();
+
+ /**
+ * get a single element on specified index
+ * @param index index of element that will be get
+ * @param result the buffer that the retrieved element will be stored
+ * @return CAPU_EINVAL invalid index
+ * CAPU_OK otherwise
+ */
+ status_t get(uint_t index, T* result) const;
+
+ /**
+ * return size of list
+ * @return return the size of list
+ */
+ int_t size() const;
+
+ /**
+ * check the list is empty or not
+ * @return true if empty
+ * false otherwise
+ */
+ bool_t isEmpty() const;
+
+ /**
+ * returns an iterator pointing to the beginning of list
+ * @return iterator
+ */
+ Iterator begin() const;
+
+ /**
+ * finds the index of given element in the link list
+ * if you are using an object you need to overload == operator
+ *
+ * @param element the value that will be searched
+ * @return -1 if the value either does not exist or given value is NULL
+ * otherwise index of value on linked list
+ */
+ int_t find(const T &element) const;
+
+ /**
+ * check that if the list contains the given parameter or not
+ * if you are using an object you need to overload == operator
+ * @param element element that will be checked
+ * @return true list contains it
+ * false otherwise
+ */
+ bool_t contains(const T &element) const;
+ };
- class ListNode {
- public:
+ template <class T, class C>
+ List<T, C>::List()
+ : mBoundary(new ListNode())
+ , mSize(0)
+ {
+ mBoundary->mNext = mBoundary;
+ mBoundary->mPrev = mBoundary;
+ }
+
+ template <class T, class C>
+ List<T, C>::List(const List<T, C>& other)
+ : mBoundary(new ListNode())
+ , mSize(0)
+ {
+ mBoundary->mNext = mBoundary;
+ mBoundary->mPrev = mBoundary;
+
+ // add all items from the other list
+ Iterator it = other.begin();
+ T current;
+ while(it.hasNext())
+ {
+ it.next(¤t);
+ add(current);
+ }
+ }
+
+ template <class T, class C>
+ List<T, C>::~List()
+ {
+ clear();
+ delete mBoundary;
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::clear()
+ {
+ ListNode* current = mBoundary->mNext;
+ ListNode* toDelete = 0;
+ while (current != mBoundary)
+ {
+ toDelete = current;
+ current = current->mNext;
+ delete toDelete;
+ }
+ mSize = 0;
+ mBoundary->mNext = mBoundary;
+ mBoundary->mPrev = mBoundary;
+ return CAPU_OK;
+ }
- ListNode() {
- mNext = NULL;
- mPrev = NULL;
- }
-
- ListNode(T data) {
- mNext = NULL;
- mPrev = NULL;
- this->mData = data;
- }
-
- T mData;
- ListNode * mNext;
- ListNode * mPrev;
+ template <class T, class C>
+ List<T,C>& List<T, C>::operator=(List<T, C> const& other)
+ {
+ clear();
+ mBoundary->mNext = mBoundary;
+ mBoundary->mPrev = mBoundary;
+
+ // add all items from the other list
+ Iterator it = other.begin();
+ T current;
+ while(it.hasNext())
+ {
+ it.next(¤t);
+ add(current);
+ }
+ return *this;
+ }
+
+ template <class T, class C>
+ int_t List<T, C>::find(const T &element) const
+ {
+ int_t counter = 0;
+ ListNode* current = mBoundary->mNext;
+ while (current != mBoundary)
+ {
+ if (mComparator(current->mData, element))
+ {
+ // element was found, return index
+ return counter;
+ }
+ current = current->mNext;
+ ++counter;
+ }
+
+ // not found
+ return -1;
+ }
+
+ template <class T, class C>
+ inline bool_t List<T, C>::contains(const T &element) const
+ {
+ return find(element) != -1;
+ }
+
+ template <class T, class C>
+ inline status_t List<T, C>::add(Iterator& iter, const T &element)
+ {
+ insertElement(iter.mCurrentNode->mPrev, element); // insert before found position
+ return CAPU_OK;
+ }
- };
+ template <class T, class C>
+ inline status_t List<T, C>::add(uint_t index, const T &element)
+ {
+ if (index > mSize) // if index == mSize, element is added at the end
+ {
+ // invalid index
+ return CAPU_EINVAL;
+ }
- class ListIterator {
- public:
- friend class List<T, C>;
- /**
- * Default Constructor
- */
- ListIterator();
-
- /**
- * constructor
- * @param initial_node where the iterator will be pointing
- */
- ListIterator(ListNode *initialNode);
-
- /**
- * destructor
- */
- ~ListIterator();
-
- /**
- * Check if iterator has next element.
- * @return false if the next of current node that is pointed, is null otherwise true
- */
- bool_t hasNext();
-
- /**
- * Shifts the iterator to the next position and returns the element if next != NULL
- * @param element
- * @return ETCH_ERANGE if the next of current node that is pointed, is null
- * CAPU_OK if the next element has been gotten
- *
- */
- status_t next(T* element = NULL);
-
- /**
- * Get current iterator element.
- * @param element
- * @return ETCH_ERANGE if the current node that is pointed, is null
- * CAPU_EINVAL if the value is NULL
- * CAPU_OK if the current element has been gotten
- *
- */
- status_t current(T* element);
+ insertElement(findElement(index)->mPrev, element); // insert before found position
+ return CAPU_OK;
+ }
- private:
- ListNode *mNextPosition;
- };
+ template <class T, class C>
+ inline status_t List<T, C>::add(const T &element)
+ {
+ insertElement(mBoundary->mPrev, element); // insert at list end (boundary->mPrev)
+ return CAPU_OK;
+ }
- ListNode *mHead;
- ListNode *mTail;
- int_t mSize;
-
- public:
-
- typedef typename List<T, C>::ListIterator Iterator;
-
- /**
- * Default Constructor
- */
- List();
-
- /**
- * Destructor
- */
- virtual ~List();
-
- /**
- * Add element to the end of list
- * @param element element that will be added
- * @return CAPU_ENO_MEMORY if allocation of element is failed
- * CAPU_OK if the element is successfully added
- */
- status_t add(const T &element);
-
- /**
- * Add element to specified position
- *
- * @param index index of element which will be inserted
- * @param element new value that will replace the old value
- *
- * @return CAPU_EINVAL if given index is invalid.
- * CAPU_ENO_MEMORY if allocation of element is failed
- * CAPU_OK if the element is successfully added
- * CAPU_ERROR otherwise
- */
- status_t add(int_t index, const T &element);
-
- /**
- * Add element to specified position
- *
- * @param iterator with the position to insert
- * @param element new value that will replace the old value
- *
- * @return CAPU_ENO_MEMORY memory allocation failed.
- * CAPU_OK otherwise
- */
- status_t add(Iterator& iter, const T &element);
-
- /**
- * remove the element in the specified index and if the element_old
- * parameter is not NULL, the removed element will be put to element_old
- * @param index index of element that will be removed
- * @param elementOld the buffer which will keep the copy of the removed element
- * @return CAPU_EINVAL invalid index
- * CAPU_OK if the element is successfully removed
- */
- status_t removeAt(int_t index, T* elementOld = NULL);
-
- /**
- * remove the element in the specified iterator position and if the element_old
- * parameter is not NULL, the removed element will be put to element_old
- * @param iterator of element that will be removed
- * @param element_old the buffer which will keep the copy of the removed element
- * @return CAPU_EINVAL invalid iterator
- * CAPU_OK if the element is successfully removed
- *
- */
- status_t removeAt(Iterator& listIterator, T* elementOld = NULL);
-
- /**
- * get a single element on specified index
- * @param index index of element that will be get
- * @param result the buffer that the retrieved element will be stored
- * @return CAPU_EINVAL invalid index
- * CAPU_OK otherwise
- */
- status_t get(int_t index, T* result);
-
- /**
- * return size of list
- * @return return the size of list
- */
- int_t size();
-
- /**
- * check the list is empty or not
- * @return true if empty
- * false otherwise
- */
- bool_t isEmpty();
-
- /**
- * returns an iterator pointing to the beginning of list
- * @return iterator
- */
- Iterator begin() const;
-
- /**
- * finds the index of given element in the link list
- * if you are using an object you need to overload == operator
- *
- * @param element the value that will be searched
- * @return -1 if the value either does not exist or given value is NULL
- * otherwise index of value on linked list
- */
- int_t find(const T &element);
-
- /**
- *
- * @param index the index of element that will be replaced
- * @param element element that will be overwritten to existing place
- * @param elementOld the buffer to keep the existing
- * @return CAPU_EINVAL if the index is not valid
- * CAPU_OK otherwise
- */
- status_t set(int_t index, const T &element, T* elementOld = NULL);
-
- /**
- * check that if the list contains the given parameter or not
- * if you are using an object you need to overload == operator
- * @param element element that will be checked
- * @return true list contains it
- * false otherwise
- */
- bool_t contains(const T &element);
-
- /**
- * removes all elements from linked list
- *
- * @return CAPU_OK if all of the elements are deleted
- *
- */
- status_t clear();
- };
-
- template <class T, class C>
- List<T, C>::List()
- : mHead(NULL),
- mTail(NULL),
- mSize(0) {
- //init linked list
- }
-
- template <class T, class C>
- List<T, C>::~List() {
- clear();
- }
-
- template <class T, class C>
- status_t List<T, C>::clear() {
- //on the deallocation delete all elements in the list
- ListNode *cursor = mHead;
- ListNode *tmp = NULL;
-
- while (cursor != NULL) {
- tmp = cursor;
- cursor = cursor->mNext;
- delete tmp;
- }
- mSize = 0;
- mHead = NULL;
- mTail = NULL;
- return CAPU_OK;
- }
-
- template <class T, class C>
- int_t List<T, C>::find(const T &element) {
- int_t counter = 0;
- ListNode * cursor = mHead;
- C comparator;
- while (cursor != NULL) {
- if (comparator(cursor->mData, element)) {
- return counter;
- }
- cursor = cursor->mNext;
- ++counter;
- }
- return -1;
- }
-
- template <class T, class C>
- bool_t List<T, C>::contains(const T &element) {
- return (find(element) != -1);
- }
-
- //add elements to the end of list
-
- template <class T, class C>
- status_t List<T, C>::add(const T &element) {
- ListNode *listElem = new ListNode(element);
- //NOT ALLOCATED
- if (listElem == NULL) {
- return CAPU_ENO_MEMORY;
- }
- //list is empty
- if (mHead == NULL) {
- mHead = listElem;
- mTail = mHead;
- } else {
- //list contains some elements so add it to the end of list
- mTail->mNext = listElem;
- listElem->mPrev = mTail;
- mTail = listElem;
- mTail->mNext = NULL;
- }
- ++mSize;
- return CAPU_OK;
- }
-
- template <class T, class C>
- status_t List<T, C>::add(int_t index, const T &element) {
- if ((index > mSize) || (index < 0)) {
- return CAPU_EINVAL;
- }
-
- ListNode *listElem = new ListNode(element);
- //NOT ALLOCATED
- if (listElem == NULL) {
- return CAPU_ENO_MEMORY;
- }
-
- int_t counter = 0;
- ListNode * cursor = mHead;
- if (cursor == NULL) {
- //empty list
- mHead = listElem;
- mTail = listElem;
- mHead->mPrev = NULL;
- mTail->mNext = NULL;
- ++mSize;
- return CAPU_OK;
- } else if (index == mSize) {
- //list contains some elements so add it to the end of list
- mTail->mNext = listElem;
- listElem->mPrev = mTail;
- mTail = listElem;
- mTail->mNext = NULL;
- ++mSize;
- return CAPU_OK;
- } else if (index == 0) {
- //add it to beginning of the list
- listElem->mNext = mHead;
- mHead->mPrev = listElem;
- listElem->mPrev = NULL;
- mHead = listElem;
- ++mSize;
- return CAPU_OK;
- }
- while (cursor != NULL) {
- if (index == counter) {
- listElem->mNext = cursor;
- listElem->mPrev = cursor->mPrev;
- if (cursor->mPrev != NULL)
- cursor->mPrev->mNext = listElem;
- cursor->mPrev = listElem;
+ template <class T, class C>
+ inline void List<T, C>::insertElement(typename List<T, C>::ListNode* addPosition, const T& element)
+ {
+ ListNode* newNode = new ListNode(element); // copy in
+ newNode->mNext = addPosition->mNext;
+ newNode->mPrev = addPosition;
+ addPosition->mNext->mPrev = newNode;
+ addPosition->mNext = newNode;
++mSize;
+ }
+
+ template <class T, class C>
+ inline void List<T, C>::deleteElement(typename List<T, C>::ListNode* deletePosition)
+ {
+ deletePosition->mPrev->mNext = deletePosition->mNext;
+ deletePosition->mNext->mPrev = deletePosition->mPrev;
+ delete deletePosition;
+ --mSize;
+ }
+
+ template <class T, class C>
+ typename List<T, C>::ListNode* List<T, C>::findElement(uint_t index) const
+ {
+ // search element by running through list from the first element
+ uint_t counter = 0;
+ ListNode* current = mBoundary->mNext;
+ while(counter < index)
+ {
+ ++counter;
+ current = current->mNext;
+ }
+
+ // current is the element that was requested
+ return current;
+ }
+
+
+ template <class T, class C>
+ status_t List<T, C>::remove(const T& element)
+ {
+ ListNode* current = mBoundary->mNext;
+ while (current != mBoundary)
+ {
+ if (mComparator(current->mData, element))
+ {
+ // deletion element found
+ deleteElement(current);
+ return CAPU_OK;
+ }
+ current = current->mNext;
+ }
+ return CAPU_EINVAL;
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::removeAt(uint_t index, T* elementOld)
+ {
+ if (index >= mSize)
+ {
+ // invalid index
+ return CAPU_EINVAL;
+ }
+
+ ListNode* toDelete = findElement(index);
+ if (elementOld)
+ {
+ *elementOld = toDelete->mData; // copy out
+ }
+ deleteElement(toDelete);
return CAPU_OK;
- }
- ++counter;
- cursor = cursor->mNext;
- }
- return CAPU_ERROR;
- }
-
- template <class T, class C>
- status_t List<T, C>::add(Iterator& iter, const T &element) {
- ListNode *listElem = new ListNode(element);
-
- //NOT ALLOCATED
- if (listElem == NULL) {
- return CAPU_ENO_MEMORY;
- }
-
- if (mHead == NULL && mTail == NULL) {
- mHead = listElem;
- mTail = mHead;
- } else if (iter.mNextPosition == NULL) {
- listElem->mNext = NULL;
- listElem->mPrev = mTail;
- mTail->mNext = listElem;
- mTail = listElem;
- } else if (iter.mNextPosition->mNext == NULL) {
- listElem->mNext = NULL;
- listElem->mPrev = iter.mNextPosition;
- iter.mNextPosition->mNext = listElem;
- mTail = listElem;
- } else if (iter.mNextPosition->mPrev == NULL) {
- listElem->mPrev = NULL;
- listElem->mNext = iter.mNextPosition;
- mHead = listElem;
- } else {
- listElem->mPrev = iter.mNextPosition->mPrev;
- listElem->mNext = iter.mNextPosition;
- iter.mNextPosition->mPrev->mNext = listElem;
- }
- iter.mNextPosition = listElem;
-
- ++mSize;
- return CAPU_OK;
-
- }
-
- //remove the specific element indicated by the index in the list
-
- template <class T, class C>
- status_t List<T, C>::removeAt(int_t index, T* elementOld) {
- if ((index < 0) || (index >= mSize)) {
- return CAPU_EINVAL;
- }
- ListNode * tmp = NULL;
- if (mHead == mTail) {
- tmp = mHead;
- mHead = NULL;
- mTail = NULL;
- } else if (index == 0) {
-
- tmp = mHead;
- mHead = mHead->mNext;
- mHead->mPrev = NULL;
- } else if (index == mSize - 1) {
- tmp = mTail;
- mTail = mTail->mPrev;
- mTail->mNext = NULL;
- } else {
- tmp = mHead;
- for (int_t i = 0; i < index; ++i) {
- tmp = tmp->mNext;
- }
- tmp->mNext->mPrev = tmp->mPrev;
- tmp->mPrev->mNext = tmp->mNext;
- }
- if (elementOld != NULL)
- *elementOld = tmp->mData;
- delete tmp;
- mSize--;
- return CAPU_OK;
- }
-
- template <class T, class C>
- status_t List<T, C>::removeAt(Iterator& listIterator, T* elementOld) {
-
- ListNode* tmp = NULL;
-
- if (mHead == mTail) {
- tmp = mHead;
- if (!tmp) {
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::removeAt(Iterator& listIterator, T* elementOld)
+ {
+ if (listIterator.hasNext())
+ {
+ if (elementOld)
+ {
+ *elementOld = listIterator.mCurrentNode->mData; // copy out
+ }
+ ListNode* node = listIterator.mCurrentNode;
+ listIterator.mCurrentNode = listIterator.mCurrentNode->mNext;
+ deleteElement(node);
+ return CAPU_OK;
+ }
return CAPU_EINVAL;
- }
- mHead = NULL;
- mTail = NULL;
- listIterator.mNextPosition = NULL;
- } else if (listIterator.mNextPosition == mHead) {
-
- tmp = mHead;
- mHead = mHead->mNext;
- mHead->mPrev = NULL;
- listIterator.mNextPosition = mHead;
- } else if (listIterator.mNextPosition == mTail) {
- tmp = mTail;
- mTail = mTail->mPrev;
- mTail->mNext = NULL;
- listIterator.mNextPosition = mTail;
- } else {
- tmp = listIterator.mNextPosition;
- listIterator.mNextPosition->mPrev->mNext = listIterator.mNextPosition->mNext;
- listIterator.mNextPosition->mNext->mPrev = listIterator.mNextPosition->mPrev;
- listIterator.mNextPosition = listIterator.mNextPosition->mPrev;
- }
-
- if (elementOld != 0) {
- *elementOld = tmp->mData;
- }
- delete tmp;
- mSize--;
-
- return CAPU_OK;
-
- }
-
- //get the specified element from list
-
- template <class T, class C>
- status_t List<T, C>::get(int_t index, T* result) {
- if (((index < 0) || (index >= mSize)) || (result == NULL)) {
- return CAPU_EINVAL;
- }
-
- if (index == 0) {
- *result = mHead->mData;
- return CAPU_OK;
- } else if (index == mSize - 1) {
- *result = mTail->mData;
- return CAPU_OK;
- }
-
- ListNode *cursor = mHead;
- for (int_t i = 0; i < index; ++i) {
- cursor = cursor->mNext;
- }
- *result = cursor->mData;
- return CAPU_OK;
- }
-
- template <class T, class C>
- status_t List<T, C>::set(int_t index, const T &element, T* elementOld) {
- if ((index < 0) || (index >= mSize))
- return CAPU_EINVAL;
-
- ListNode *cursor = mHead;
- for (int_t i = 0; i < index; ++i) {
- cursor = cursor->mNext;
- }
- if (elementOld != NULL)
- *elementOld = cursor->mData;
- cursor->mData = element;
- return CAPU_OK;
- }
-
- //Return element count of list
-
- template <class T, class C>
- int_t List<T, C>::size() {
- return mSize;
- }
-
- //checks if the list is empty or not
-
- template <class T, class C>
- bool_t List<T, C>::isEmpty() {
- if (mSize == 0)
- return true;
- else
- return false;
- }
-
- template <class T, class C>
- typename List<T, C>::Iterator List<T, C>::begin() const {
- return ListIterator(mHead);
- }
-
- template <class T, class C>
- List<T, C>::ListIterator::ListIterator()
- : mNextPosition(NULL) {
-
- }
-
- template <class T, class C>
- List<T, C>::ListIterator::~ListIterator() {
-
- }
-
- template <class T, class C>
- List<T, C>::ListIterator::ListIterator(ListNode *initialNode) {
- mNextPosition = initialNode;
- }
-
- template <class T, class C>
- bool_t List<T, C>::ListIterator::hasNext() {
- if (mNextPosition == NULL) {
- return false;
- }
- return true;
- }
-
- template <class T, class C>
- status_t List<T, C>::ListIterator::next(T* element) {
- T* result = 0;
- if (mNextPosition == NULL) {
- return CAPU_ERANGE;
- } else {
- result = &mNextPosition->mData;
- mNextPosition = mNextPosition->mNext;
- }
- if (element != NULL) {
- *element = *result;
- }
- return CAPU_OK;
- }
-
- template <class T, class C>
- status_t List<T, C>::ListIterator::current(T* value) {
- if (mNextPosition == 0) {
- return CAPU_ERANGE;
- } else if (value == 0) {
- return CAPU_EINVAL;
- } else {
- *value = mNextPosition->mData;
- return CAPU_OK;
}
- }
-}
-#endif /* __LIST_H__ */
+ template <class T, class C>
+ inline status_t List<T, C>::set(uint_t index, const T &element, T* elementOld)
+ {
+ if (index >= mSize)
+ {
+ // invalid index
+ return CAPU_EINVAL;
+ }
+
+ ListNode* node = findElement(index);
+ if (elementOld)
+ {
+ *elementOld = node->mData; // copy out
+ }
+ node->mData = element; // copy in
+ return CAPU_OK;
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::get(uint_t index, T* result) const
+ {
+ if (index >= mSize)
+ {
+ // invalid index
+ return CAPU_EINVAL;
+ }
+
+ *result = findElement(index)->mData; // copy out
+ return CAPU_OK;
+ }
+
+ template <class T, class C>
+ inline int_t List<T, C>::size() const
+ {
+ return mSize;
+ }
+
+ template <class T, class C>
+ inline bool_t List<T, C>::isEmpty() const
+ {
+ return mSize == 0;
+ }
+
+ template <class T, class C>
+ typename List<T, C>::Iterator List<T, C>::begin() const
+ {
+ return ListIterator(mBoundary);
+ }
+
+ template <class T, class C>
+ List<T, C>::ListIterator::ListIterator(ListNode* boundary)
+ : mInitialNode(boundary)
+ , mCurrentNode(boundary->mNext)
+ , mIndex(0)
+ {
+ }
+
+ template <class T, class C>
+ List<T, C>::ListIterator::~ListIterator()
+ {
+ }
+
+ template <class T, class C>
+ bool_t List<T, C>::ListIterator::hasNext()
+ {
+ return mInitialNode != mCurrentNode;
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::ListIterator::next(T* element)
+ {
+ if (element)
+ {
+ status_t ret = current(element);
+ if (ret != CAPU_OK)
+ {
+ return ret; // don't continue
+ }
+ }
+ mCurrentNode = mCurrentNode->mNext;
+ ++mIndex;
+ return CAPU_OK;
+ }
+
+ template <class T, class C>
+ uint32_t List<T, C>::ListIterator::currentIndex()
+ {
+ return mIndex;
+ }
+
+ template <class T, class C>
+ status_t List<T, C>::ListIterator::current(T* element)
+ {
+ if (!hasNext())
+ {
+ return CAPU_ERANGE;
+ }
+ if (!element)
+ {
+ return CAPU_EINVAL;
+ }
+ *element = mCurrentNode->mData; // copy out
+ return CAPU_OK;
+ }
+}
+#endif /* __List_H__ */
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/test/container/ListTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/test/container/ListTest.cpp?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/test/container/ListTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/test/container/ListTest.cpp Wed Oct 17 06:48:21 2012
@@ -30,13 +30,11 @@ TEST(List, Constructor_Default) {
TEST(List, addTest) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 0;
capu::status_t result;
- data1 = 32;
- data2 = 43;
//append element to the linked list
result = list->add(data1);
EXPECT_TRUE(result == capu::CAPU_OK);
@@ -57,13 +55,12 @@ TEST(List, addTest) {
TEST(List, addIndexTest) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 0;
capu::status_t result;
- data1 = 32;
- data2 = 43;
+
result = list->add(10, data1);
EXPECT_TRUE(result == capu::CAPU_EINVAL);
@@ -93,9 +90,9 @@ TEST(List, addIndexTest) {
TEST(List, removeAt) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 56;
capu::status_t result;
data1 = 32;
@@ -134,18 +131,59 @@ TEST(List, removeAt) {
delete list;
}
-TEST(List, get) {
- capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
+TEST(List, getElementInConstList) {
+ capu::List<capu::int32_t>* normalList = new capu::List<capu::int32_t > ();
+ const capu::List<capu::int32_t>* constantList = normalList;
capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
- capu::int32_t data4;
capu::status_t result;
data1 = 32;
- data2 = 43;
- data3 = 56;
+
+ result = normalList->add(data1);
+ EXPECT_TRUE(result == capu::CAPU_OK);
+
+ result = constantList->get(0, &data1);
+ EXPECT_TRUE(result == capu::CAPU_OK);
+
+ delete normalList;
+}
+
+
+
+TEST(List, loopThroughConstList) {
+ capu::List<capu::int32_t>* normalList = new capu::List<capu::int32_t > ();
+ const capu::List<capu::int32_t>* constantList = normalList;
+ capu::int32_t data1;
+
+ capu::status_t result;
+
+ data1 = 32;
+
+ result = normalList->add(data1);
+ EXPECT_TRUE(result == capu::CAPU_OK);
+
+
+ capu::List<capu::int32_t>::Iterator iterator = constantList->begin();
+ while (iterator.hasNext())
+ {
+ capu::int32_t* temp=0;;
+ iterator.next(temp);
+ }
+
+ delete normalList;
+}
+
+TEST(List, get) {
+ capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 56;
+ capu::int32_t data4 = 0;
+
+ capu::status_t result;
+
+
//add some element to the linked list
result = list->add(data1);
@@ -178,11 +216,9 @@ TEST(List, get) {
TEST(List, size) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
-
capu::int_t result;
+ capu::int32_t data1 = 32;;
- data1 = 32;
//size of empty list
result = list->size();
EXPECT_TRUE(result == 0);
@@ -213,12 +249,11 @@ TEST(List, size) {
TEST(List, empty) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
-
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
capu::bool_t result;
- data1 = 32;
-
//check the empty list
result = list->isEmpty();
EXPECT_TRUE(result == true);
@@ -233,14 +268,12 @@ TEST(List, empty) {
TEST(List, find) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
capu::int_t result;
- data1 = 32;
- data2 = 43;
- data3 = 44;
+
//check empty list
result = list->find(data1);
@@ -266,9 +299,9 @@ TEST(List, find) {
TEST(List, contains) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
capu::int32_t check_value = 0;
capu::bool_t result;
@@ -297,17 +330,52 @@ TEST(List, contains) {
delete list;
}
+TEST(List, copyConstructor1) {
+ capu::List<capu::int32_t> list;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
+
+ //add some dummy values to the linked list
+ list.add(data1);
+ list.add(data2);
+ list.add(data3);
+
+ capu::List<capu::int32_t> copy(list);
+
+ EXPECT_EQ(list.size(), copy.size());
+ list.clear();
+
+ EXPECT_EQ(0, copy.find(data1));
+ EXPECT_EQ(1, copy.find(data2));
+ EXPECT_EQ(2, copy.find(data3));
+}
+
+TEST(List, copyConstructor2) {
+ // copy empty list and add values afterwards to original list
+ capu::List<capu::int32_t> list;
+ capu::List<capu::int32_t> copy(list);
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
+
+ copy.add(data1);
+ copy.add(data2);
+ copy.add(data3);
+
+ EXPECT_EQ(0, copy.find(data1));
+ EXPECT_EQ(1, copy.find(data2));
+ EXPECT_EQ(2, copy.find(data3));
+ EXPECT_TRUE(list.isEmpty());
+}
+
TEST(List, clear) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
capu::status_t result;
- data1 = 32;
- data2 = 43;
- data3 = 44;
-
//add some dummy values to the linked list
list->add(data1);
list->add(data1);
@@ -328,11 +396,8 @@ TEST(List, clear) {
TEST(List, set) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
-
- data1 = 32;
- data2 = 43;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
EXPECT_TRUE(list->add(data1) == capu::CAPU_OK);
EXPECT_TRUE(list->add(data2) == capu::CAPU_OK);
@@ -346,14 +411,11 @@ TEST(List, set) {
TEST(ListIterator, hasNext) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
capu::List<capu::int32_t>::Iterator it = list->begin();
EXPECT_TRUE(it.hasNext() == false);
- data1 = 32;
- data2 = 43;
-
list->add(data1);
list->add(data2);
@@ -365,14 +427,13 @@ TEST(ListIterator, hasNext) {
TEST(ListIterator, next) {
capu::List<capu::int32_t>* list = new capu::List<capu::int32_t > ();
- capu::int32_t data1;
- capu::int32_t data2;
- capu::int32_t data3;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 0;
capu::List<capu::int32_t>::Iterator it = list->begin();
capu::int32_t cnt = 0;
EXPECT_TRUE(it.hasNext() == false);
- data1 = 32;
- data2 = 43;
+
list->add(data1);
list->add(data2);
it = list->begin();
@@ -456,8 +517,8 @@ TEST(ListIterator, removeAt){
}
TEST(ListIterator, add){
- capu::List<capu::int32_t> list;
- capu::List<capu::int32_t>::Iterator iter;
+ capu::List<capu::int32_t> list;
+ capu::List<capu::int32_t>::Iterator iter = list.begin();
capu::int32_t data1 = 0;
list.add(iter, 1);
@@ -514,10 +575,29 @@ TEST(ListIterator, add){
}
+TEST(ListIterator, currentIndex){
+ capu::List<capu::int32_t> list;
+ capu::int32_t data1 = 32;
+ capu::int32_t data2 = 43;
+ capu::int32_t data3 = 44;
+
+ //add some dummy values to the linked list
+ list.add(data1);
+ list.add(data2);
+ list.add(data3);
+
+ capu::List<capu::int32_t>::Iterator iter = list.begin();
+
+ EXPECT_EQ(0u, iter.currentIndex());
+ iter.next();
+ EXPECT_EQ(1u, iter.currentIndex());
+ iter.next();
+ EXPECT_EQ(2u, iter.currentIndex());
+}
TEST(ListIterator, loopAdd){
capu::List<capu::int32_t> list;
- capu::List<capu::int32_t>::Iterator iter;
+ capu::List<capu::int32_t>::Iterator iter = list.begin();
capu::int32_t data1 = 0;
list.add(iter, 1);
@@ -525,7 +605,7 @@ TEST(ListIterator, loopAdd){
iter = list.begin();
while(iter.hasNext())
{
- iter.next(&data1);
+ iter.next(&data1);
}
list.add(iter, 2);
@@ -540,10 +620,10 @@ TEST(ListIterator, loopAdd){
capu::int32_t i = 1;
while(i <= 3)
{
- EXPECT_TRUE(iter.current(&data1) == capu::CAPU_OK);
- EXPECT_EQ(i, data1);
- iter.next();
- i++;
+ EXPECT_TRUE(iter.current(&data1) == capu::CAPU_OK);
+ EXPECT_EQ(i, data1);
+ iter.next();
+ i++;
}
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp?rev=1399110&r1=1399109&r2=1399110&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp Wed Oct 17 06:48:21 2012
@@ -225,13 +225,13 @@ TEST(EtchList, find) {
//find the elements
result = list->find(data1);
- EXPECT_TRUE(result == 0);
+ EXPECT_EQ(0, result);
result = list->find(data2);
- EXPECT_TRUE(result == 1);
+ EXPECT_EQ(1, result);
result = list->find(data3);
- EXPECT_TRUE(result == 2);
+ EXPECT_EQ(2, result);
delete list;
}
Author: veithm
Date: Fri Sep 28 11:49:23 2012
New Revision: 833257
Log:
Updated Wireshark information on tools page. Added preference window screenshot
Added:
websites/production/etch/content/
- copied from r833256, websites/staging/etch/trunk/content/
Author: buildbot
Date: Fri Sep 28 11:47:52 2012
New Revision: 833256
Log:
Staging update by buildbot for etch
Added:
websites/staging/etch/trunk/content/etch/images/etch-wireshark-preferences-window.png
(with props)
Modified:
websites/staging/etch/trunk/content/ (props changed)
Propchange: websites/staging/etch/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep 28 11:47:52 2012
@@ -1 +1 @@
-1391407
+1391408
Added: websites/staging/etch/trunk/content/etch/images/etch-wireshark-preferences-window.png
==============================================================================
Binary file - no diff available.
Propchange: websites/staging/etch/trunk/content/etch/images/etch-wireshark-preferences-window.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: websites/staging/etch/trunk/content/etch/images/etch-wireshark-preferences-window.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Author: veithm
Date: Fri Sep 28 11:47:49 2012
New Revision: 1391408
URL: http://svn.apache.org/viewvc?rev=1391408&view=rev
Log:
ETCH-202 Added Wireshark preference window image
Added:
incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png
(with props)
Added: incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png
URL: http://svn.apache.org/viewvc/incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png?rev=1391408&view=auto
==============================================================================
Files incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png
(added) and incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png
Fri Sep 28 11:47:49 2012 differ
Propchange: incubator/etch/site/trunk/content/etch/images/etch-wireshark-preferences-window.png
------------------------------------------------------------------------------
svn:executable = *
Author: buildbot
Date: Fri Sep 28 11:46:47 2012
New Revision: 833255
Log:
Staging update by buildbot for etch
Modified:
websites/staging/etch/trunk/content/ (props changed)
websites/staging/etch/trunk/content/etch/tools.html
Propchange: websites/staging/etch/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Sep 28 11:46:47 2012
@@ -1 +1 @@
-1387904
+1391407
Modified: websites/staging/etch/trunk/content/etch/tools.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/tools.html (original)
+++ websites/staging/etch/trunk/content/etch/tools.html Fri Sep 28 11:46:47 2012
@@ -81,10 +81,9 @@
<div id="content">
<h1 id="tools">Tools</h1>
<p>The Apache Etch project developed also some tools to work with the Etch framework.
Following you can find more about these.</p>
-<h3 id="wireshark_etch_tracing">Wireshark Etch Tracing</h3>
-<p>The Wireshark plugin for Etch uses compiler-generated files to disassemble the wire
protocol (<em>.ewh files). In the Wireshark Etch plugin preferences, you can specify
a path to your generated </em>.ewh files and you will get your specific analyzed and
displayed directly in Wireshark!</p>
-<p>There is no official stable Wireshark release containing Etch yet. If you need/want
Wireshark support for your project, you can use the Wireshark 1.5.0 Development Release that
was released by January 24, 2011. Any more you can build the wireshark trunk yourself (instruction
for this, see <a href="http://www.wireshark.org/develop.html">http://www.wireshark.org/develop.html</a>).
<br />
-</p>
+<h3 id="wireshark-etch-tracing">Wireshark Etch Tracing</h3>
+<p>The Wireshark plugin for Etch uses compiler-generated files to disassemble the wire
protocol (.ewh files). In the Wireshark Etch plugin preferences (Edit -> Preferences
-> Protocols -> Etch), you can specify a path to your generated .ewh files and
you will get your specific analyzed and displayed directly in Wireshark. The plugin is available
in Wireshark since version 1.5.0.</p>
+<p><img alt="Wireshark preference window for the Etch protocol" src="images/etch-wireshark-preferences-window.png"
/></p>
</div>
<div class="clear"></div>
Author: veithm
Date: Fri Sep 28 11:46:43 2012
New Revision: 1391407
URL: http://svn.apache.org/viewvc?rev=1391407&view=rev
Log:
ETCH-202 Updated Tools page
Modified:
incubator/etch/site/trunk/content/etch/tools.mdtext
Modified: incubator/etch/site/trunk/content/etch/tools.mdtext
URL: http://svn.apache.org/viewvc/incubator/etch/site/trunk/content/etch/tools.mdtext?rev=1391407&r1=1391406&r2=1391407&view=diff
==============================================================================
--- incubator/etch/site/trunk/content/etch/tools.mdtext (original)
+++ incubator/etch/site/trunk/content/etch/tools.mdtext Fri Sep 28 11:46:43 2012
@@ -4,6 +4,6 @@ The Apache Etch project developed also s
### Wireshark Etch Tracing
-The Wireshark plugin for Etch uses compiler-generated files to disassemble the wire protocol
(*.ewh files). In the Wireshark Etch plugin preferences, you can specify a path to your generated
*.ewh files and you will get your specific analyzed and displayed directly in Wireshark!
+The Wireshark plugin for Etch uses compiler-generated files to disassemble the wire protocol
(.ewh files). In the Wireshark Etch plugin preferences (Edit -> Preferences -> Protocols
-> Etch), you can specify a path to your generated .ewh files and you will get your specific
analyzed and displayed directly in Wireshark. The plugin is available in Wireshark since version
1.5.0.
-There is no official stable Wireshark release containing Etch yet. If you need/want Wireshark
support for your project, you can use the Wireshark 1.5.0 Development Release that was released
by January 24, 2011. Any more you can build the wireshark trunk yourself (instruction for
this, see [http://www.wireshark.org/develop.html](http://www.wireshark.org/develop.html)).
+
Author: veithm
Date: Thu Sep 20 08:32:06 2012
New Revision: 832526
Log:
Added News announcing the cpp binding alpha version
Added:
websites/production/etch/content/
- copied from r832525, websites/staging/etch/trunk/content/
Author: buildbot
Date: Thu Sep 20 08:30:08 2012
New Revision: 832525
Log:
Staging update by buildbot for etch
Modified:
websites/staging/etch/trunk/content/ (props changed)
websites/staging/etch/trunk/content/etch/index.html
Propchange: websites/staging/etch/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 20 08:30:08 2012
@@ -1 +1 @@
-1326501
+1387904
Modified: websites/staging/etch/trunk/content/etch/index.html
==============================================================================
--- websites/staging/etch/trunk/content/etch/index.html (original)
+++ websites/staging/etch/trunk/content/etch/index.html Thu Sep 20 08:30:08 2012
@@ -79,7 +79,7 @@
</ul>
</div>
<div id="content">
- <h1 id="welcome_to_apache_incubator_etch">Welcome to Apache Incubator Etch</h1>
+ <h1 id="welcome-to-apache-incubator-etch">Welcome to Apache Incubator Etch</h1>
<p>Etch is a cross-platform, language- and transport-independent framework for building
and consuming network services. The Etch toolset includes a network service description
language, a compiler, and binding libraries for a variety of programming languages.
@@ -102,6 +102,11 @@ difficult than library development and c
<h2 id="news">News</h2>
<ul>
<li>
+<p><em>Etch C++ Binding alpha version</em><br/>
+ The Apache Etch team has been working on the C++ Binding for the last few months. Now we
are happy to announce that a first working alpha version is now available in the <a href="sources.html">SVN
repository</a>. Check it out!
+ For bug reports or feature request please refer to our <a href="issue-tracking.html">BugTracker</a>.</p>
+</li>
+<li>
<p><em>Apache Incubator Etch 1.2.0</em><br />
The Apache Etch development team is really pleased to announce the new stable build <a
href="downloads.html">Apache Etch 1.2.0-incubating</a>.<br />
(2012-01-03) <br />
@@ -114,7 +119,7 @@ difficult than library development and c
</p>
</li>
</ul>
-<h2 id="project_status">Project Status</h2>
+<h2 id="project-status">Project Status</h2>
<p>The Apache Incubator Etch project is permanently in progress. The latest stable
version can be downloaded <a href="downloads.html">here</a>. The language bindings
are currently in different states:</p>
<ul>
<li>Java - stable</li>
@@ -124,7 +129,7 @@ difficult than library development and c
<li>Javascript - alpha</li>
<li>Python - alpha</li>
</ul>
-<h2 id="incubator_status">Incubator Status</h2>
+<h2 id="incubator-status">Incubator Status</h2>
<p>Apache Etch is an effort undergoing incubation at The Apache Software Foundation
(ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects
until a further review indicates that the infrastructure, communications, and decision making
process have stabilized in a manner consistent with other successful ASF projects. While incubation
status is not necessarily a reflection of the completeness or stability of the code, it does
indicate that the project has yet to be fully endorsed by the ASF.</p>
</div>
<div class="clear"></div>
Author: veithm
Date: Thu Sep 20 08:30:04 2012
New Revision: 1387904
URL: http://svn.apache.org/viewvc?rev=1387904&view=rev
Log:
ETCH-202 Added News for cpp binding alpha version
Modified:
incubator/etch/site/trunk/content/etch/index.mdtext
Modified: incubator/etch/site/trunk/content/etch/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/etch/site/trunk/content/etch/index.mdtext?rev=1387904&r1=1387903&r2=1387904&view=diff
==============================================================================
--- incubator/etch/site/trunk/content/etch/index.mdtext (original)
+++ incubator/etch/site/trunk/content/etch/index.mdtext Thu Sep 20 08:30:04 2012
@@ -39,6 +39,10 @@ Etch was started because we wanted to ha
## News
+* *Etch C++ Binding alpha version*<br/>
+ The Apache Etch team has been working on the C++ Binding for the last few months. Now we
are happy to announce that a first working alpha version is now available in the [SVN repository](sources.html).
Check it out!
+ For bug reports or feature request please refer to our [BugTracker](issue-tracking.html).
+
* *Apache Incubator Etch 1.2.0*
The Apache Etch development team is really pleased to announce the new stable build [Apache
Etch 1.2.0-incubating](downloads.html).
(2012-01-03)
Author: veithm
Date: Thu Sep 20 08:29:09 2012
New Revision: 832524
Log:
Added notes for building the c/cpp bindings on a Linux 64bit system
Added:
websites/production/etch/content/
- copied from r832523, websites/staging/etch/trunk/content/
Author: veithm
Date: Thu Aug 23 16:48:30 2012
New Revision: 1376589
URL: http://svn.apache.org/viewvc?rev=1376589&view=rev
Log:
ETCH-216 Small improvement in TcpConnection
Avoiding QNX Sockets to fail while setting properties
Fixed small bugs in code generation
Change-Id: I2fe3a9dcae70525544f774f7ffc07facae9234fb
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
incubator/etch/trunk/examples/helloworld/cpp/build.xml
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
Thu Aug 23 16:48:30 2012
@@ -182,6 +182,7 @@ status_t $clname::newListener(EtchRuntim
//create valuefactory instance
ValueFactory${i}* vf = new ValueFactory${i}(uri);
+ stack->setValueFactory(vf);
EtchObject* vfobj = (EtchObject*) vf;
EtchObject* resobj = NULL;
res->put(EtchTransport<ValueFactory${i}>::VALUE_FACTORY(), vfobj, resobj);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp Thu Aug 23 16:48:30
2012
@@ -33,6 +33,7 @@ EtchStack::EtchStack() : EtchObject()
, mTransportPacket(NULL)
, mTransportMessage(NULL)
, mResources(NULL)
+ , mValueFactory(NULL)
, mMailboxManager(NULL)
, mDeliveryService(NULL)
, mStub(NULL)
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp Thu
Aug 23 16:48:30 2012
@@ -257,46 +257,49 @@ capu::bool_t EtchTcpConnection::isStarte
void EtchTcpConnection::run() {
+ status_t status;
capu::bool_t first = true;
while (mIsStarted) {
- if (openSocket(!first) != ETCH_OK) {
+ status = openSocket(!first);
+ if (status != ETCH_OK) {
CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Socket
has not been successfully opened", mHost.c_str(), mPort);
break;
}
- status_t res = setupSocket();
- if (res != ETCH_OK) {
+ status = setupSocket();
+ if (status != ETCH_OK) {
close();
break;
}
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Socket has
been opened and connection has been successfully established and start reading", mHost.c_str(),
mPort);
fireUp();
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => FireUp was
send to the Stack", mHost.c_str(), mPort);
- if (readSocket() != ETCH_OK) {
- close();
- CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Connection
closing", mHost.c_str(), mPort);
- break;
- }
+ status = readSocket();
CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Connection
closing", mHost.c_str(), mPort);
fireDown();
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => FireDown
was send to the Stack", mHost.c_str(), mPort);
close();
first = false;
}
- mIsStarted = false;
}
status_t EtchTcpConnection::setupSocket() {
- if (mSocket->setBufferSize(mOptions.getBufferSize()) != ETCH_OK)
- return ETCH_ERROR;
- if (mSocket->setKeepAlive((mOptions.getKeepAlive() != 0)) != ETCH_OK)
+ if (mOptions.getBufferSize() != 0) {
+ if (mSocket->setBufferSize(mOptions.getBufferSize()) != ETCH_OK) {
+ return ETCH_ERROR;
+ }
+ }
+ if (mSocket->setKeepAlive((mOptions.getKeepAlive() != 0)) != ETCH_OK) {
return ETCH_ERROR;
- if (mSocket->setLingerOption((mOptions.getLingerTime() >= 0), mOptions.getLingerTime())
!= ETCH_OK)
+ }
+ if (mSocket->setLingerOption((mOptions.getLingerTime() >= 0), mOptions.getLingerTime())
!= ETCH_OK) {
return ETCH_ERROR;
- if (mSocket->setNoDelay((mOptions.getNoDelay() != 0)) != ETCH_OK)
+ }
+ if (mSocket->setNoDelay((mOptions.getNoDelay() != 0)) != ETCH_OK) {
return ETCH_ERROR;
+ }
CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Settings for
socket has been successfully configured", mHost.c_str(), mPort);
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
Thu Aug 23 16:48:30 2012
@@ -65,7 +65,7 @@ status_t EtchTcpTransportFactory::newTra
return ETCH_EUNIMPL;
} else {
// TODO add runtime
- c = new EtchTcpConnection(NULL, (EtchSocket*) socket, &u);
+ c = new EtchTcpConnection(mRuntime, (EtchSocket*) socket, &u);
}
stack->setTransportData(c);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
Thu Aug 23 16:48:30 2012
@@ -50,18 +50,22 @@ public:
class MockListener : public virtual EtchSessionListener<EtchSocket> {
public:
+ MockListener() : socket(NULL) {}
- //Communication Test Between Peers
+ ~MockListener() {
+ delete socket;
+ }
EtchResources resources;
+ EtchSocket* socket;
+ //Communication Test Between Peers
status_t sessionAccepted(EtchSocket* connection) {
EtchString _socket("socket");
EtchObject *tmp;
resources.put(_socket, connection, tmp);
connection->send((unsigned char *) "mock", 4);
- capu::Thread::Sleep(1000);
- delete connection;
+ socket = connection;
return ETCH_OK;
}
@@ -113,15 +117,15 @@ TEST_F(EtchTcpConnectionTest, isStartedT
EtchSessionData* mPacketizer = new MockPacketizer();
//START THE LISTENER
listener->setSession(mSessionListener);
- listener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new
EtchInt32(2000));
+ EXPECT_EQ(ETCH_OK, listener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()),
new EtchInt32(400000)));
//START THE TRANSPORT
conn->setSession(mPacketizer);
- conn->transportControl(new EtchString(EtchTcpConnection::START_AND_WAIT_UP()), new EtchInt32(2000));
+ EXPECT_EQ(ETCH_OK, conn->transportControl(new EtchString(EtchTcpConnection::START_AND_WAIT_UP()),
new EtchInt32(400000)));
EXPECT_TRUE(conn->isStarted());
//STOP THE TRANSPORT
- conn->transportControl(new EtchString(EtchTcpConnection::STOP_AND_WAIT_DOWN()), new
EtchInt32(2000));
+ EXPECT_EQ(ETCH_OK, conn->transportControl(new EtchString(EtchTcpConnection::STOP_AND_WAIT_DOWN()),
new EtchInt32(400000)));
//STOP THE LISTENER
- listener->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()), new
EtchInt32(2000));
+ EXPECT_EQ(ETCH_OK, listener->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()),
new EtchInt32(400000)));
EXPECT_FALSE(conn->isStarted());
conn->setSession(NULL);
Modified: incubator/etch/trunk/examples/helloworld/cpp/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/build.xml?rev=1376589&r1=1376588&r2=1376589&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/build.xml (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/build.xml Thu Aug 23 16:48:30 2012
@@ -95,7 +95,7 @@
<target name="build-cpp" depends="generate-sources" if="USE.cmake">
<cmake srcdir="${basedir}" bindir="${basedir}/target" buildtype="Debug" >
- <generator name="Visual Studio 8 2005" platform="windows" />
+ <!-- <generator name="Visual Studio 8 2005" platform="windows" />-->
<variable name="ETCH_INCLUDE_CAPU_DIR" type="PATH" value="${Etch.basedir}/binding-cpp/runtime/lib/capu/deliverable/capu/include/capu"
/>
<variable name="ETCH_HOME" type="PATH" value="${etch.home}" />
</cmake>
@@ -103,14 +103,10 @@
<fileset dir="${target}" >
<include name="helloworld-client" />
<include name="helloworld-server" />
- <include name="debug/helloworld-client.exe" />
- <include name="debug/helloworld-server.exe" />
+ <include name="Debug/helloworld-client.exe" />
+ <include name="Debug/helloworld-server.exe" />
</fileset>
</copy>
- <delete file="${target}/helloworld-client" quiet="true" />
- <delete file="${target}/helloworld-server" quiet="true" />
- <delete file="${target}/debug/helloworld-client.exe" quiet="true" />
- <delete file="${target}/debug/helloworld-server.exe" quiet="true" />
<chmod perm="+x">
<fileset dir="${bin}">
<include name="helloworld-client" />
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
Thu Aug 23 16:48:16 2012
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include "support/EtchTransportHelper.h"
+#include "support/EtchStackServer.h"
#include "transport/EtchTcpTransportFactory.h"
static const char* TAG = "EtchTcpTransportFactory";
@@ -39,9 +41,20 @@ EtchTcpTransportFactory::~EtchTcpTranspo
}
status_t EtchTcpTransportFactory::newTransport(EtchString uri, EtchResources* resources,
EtchTransportMessage*& result) {
+ status_t status;
+
+ if (resources == NULL) {
+ return ETCH_ERROR;
+ }
+
+ EtchStack* stack = NULL;
+ status = resources->get(EtchStack::STACK(), (EtchObject*&)stack);
+ if (status != ETCH_OK) {
+ return status;
+ }
+
EtchURL u(uri);
- status_t status;
EtchObject* socket = NULL;
status = resources->get(SOCKET(), socket);
@@ -54,22 +67,20 @@ status_t EtchTcpTransportFactory::newTra
// TODO add runtime
c = new EtchTcpConnection(NULL, (EtchSocket*) socket, &u);
}
+ stack->setTransportData(c);
EtchTransportPacket* p = new EtchPacketizer(c, &u);
+ stack->setTransportPacket(p);
EtchTransportMessage* m = new EtchMessagizer(p, &u, resources);
+ stack->setTransportMessage(m);
//TODO: ADD FILTERS HERE
EtchObject* obj = NULL;
if (resources->get(EtchTransport<EtchSocket>::VALUE_FACTORY(), obj) != ETCH_OK)
{
- c->setSession(NULL);
- p->setSession(NULL);
- m->setSession(NULL);
- delete c;
- delete p;
- delete m;
+ delete stack;
return ETCH_ENOT_EXIST;
}
EtchValueFactory *vf = (EtchValueFactory*) obj;
@@ -90,18 +101,19 @@ status_t EtchTcpTransportFactory::newLis
l = new EtchTcpListener(&u);
}
- result = new MySessionListener(mRuntime, l, uri, resources, mIsSecure);
+ result = new MySessionListener(mRuntime, this, l, uri, resources, mIsSecure);
if (result == NULL) {
return ETCH_ERROR;
}
return ETCH_OK;
}
-EtchTcpTransportFactory::MySessionListener::MySessionListener(EtchRuntime* runtime, EtchTransport<EtchSessionListener<EtchSocket>
> *transport, EtchString uri, EtchResources* resources, capu::bool_t secure)
-: mRuntime(runtime), mTransport(transport), mUri(uri), mResources(resources), mIsSecure(secure)
{
+EtchTcpTransportFactory::MySessionListener::MySessionListener(EtchRuntime* runtime, EtchTcpTransportFactory*
factory, EtchTransport<EtchSessionListener<EtchSocket> > *transport, EtchString
uri, EtchResources* resources, capu::bool_t secure)
+: mRuntime(runtime), mFactory(factory), mTransport(transport), mUri(uri), mResources(resources),
mIsSecure(secure) {
if (mTransport != NULL) {
mTransport->setSession(this);
}
+ mConnectionStacks = new capu::List<EtchStack*>();
}
EtchServerFactory* EtchTcpTransportFactory::MySessionListener::getSession() {
@@ -112,6 +124,22 @@ EtchTcpTransportFactory::MySessionListen
if(mTransport != NULL) {
delete mTransport;
}
+ if(mFactory != NULL) {
+ delete mFactory;
+ }
+ if (mResources != NULL) {
+ EtchTransportHelper::DestroyResources(mResources);
+ }
+
+ capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
+ while (it.hasNext()) {
+ EtchStack* st = NULL;
+ it.next(&st);
+ if (st != NULL) {
+ delete st;
+ }
+ }
+ delete mConnectionStacks;
}
void EtchTcpTransportFactory::MySessionListener::setSession(EtchServerFactory* session) {
@@ -139,7 +167,30 @@ status_t EtchTcpTransportFactory::MySess
}
status_t EtchTcpTransportFactory::MySessionListener::sessionNotify(capu::SmartPointer<EtchObject>
event) {
+ if (event->equals(&EtchTcpListener::CONNECTION_CHECK())) {
+ //go through the list of connection and check if the connection is still dead and we
have to clean the stack up
+ capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
+ while (it.hasNext()) {
+ EtchStack* stack = NULL;
+ status_t res = it.current(&stack);
+ if (res == ETCH_OK) {
+ EtchTcpConnection* con = (EtchTcpConnection*) stack->getTransportData();
+ if (con != NULL) {
+ if (!con->isStarted()) {
+ //delete all instances for this stack
+ delete stack;
+ //remote stack from list
+ mConnectionStacks->removeAt(it);
+ }
+ }
+ }
+ it.next();
+ }
+ return ETCH_OK;
+ }
+
return mSession->sessionNotify(event);
+
}
status_t EtchTcpTransportFactory::MySessionListener::sessionAccepted(EtchSocket* connection)
{
@@ -147,60 +198,56 @@ status_t EtchTcpTransportFactory::MySess
return ETCH_ERROR;
}
+ status_t status;
+
+ EtchStackServer *stack = new EtchStackServer();
+
EtchResources *res = new EtchResources(mResources);
+ stack->setResources(res);
// put socket to the resources
EtchObject *obj = NULL;
- if (res->put(SOCKET(), connection, obj) != ETCH_OK) {
- delete res;
+ status = res->put(SOCKET(), connection, obj);
+ if (status != ETCH_OK) {
+ delete stack;
return ETCH_ERROR;
}
// create value vatory and put it to the resources
EtchValueFactory* vf = NULL;
- if(mSession->newValueFactory(mUri, vf) != ETCH_OK) {
- delete res;
+ status = mSession->newValueFactory(mUri, vf);
+ if(status != ETCH_OK) {
+ delete stack;
return ETCH_ERROR;
}
- if(res->put(EtchTransport<EtchSocket>::VALUE_FACTORY(), vf, obj) != ETCH_OK)
- {
- delete vf;
- delete res;
+ stack->setValueFactory(vf);
+
+ status = res->put(EtchTransport<EtchSocket>::VALUE_FACTORY(), vf, obj);
+ if(status != ETCH_OK) {
+ delete stack;
return ETCH_ERROR;
}
- EtchURL u = EtchURL(mUri);
-
- EtchObject* socket = NULL;
- if (res->get(SOCKET(), socket) != ETCH_OK) {
- return ETCH_ENOT_EXIST;
+ EtchObject* old = NULL;
+ status = res->put(EtchStack::STACK(), stack, old);
+ if (status != ETCH_OK) {
+ delete stack;
+ return ETCH_ERROR;
}
- // TODO check if we should register a new stack to the runtime
-
- EtchTransportData *c = NULL;
- if (mIsSecure) {
- //TODO : secure communication via ssl sockets
- return ETCH_EUNIMPL;
- } else {
- c = new EtchTcpConnection(mRuntime, (EtchSocket*) socket, &u);
+ if (old != NULL) {
+ delete old;
}
- EtchTransportPacket* p = new EtchPacketizer(c, &u);
+ //add stack container to list
+ mConnectionStacks->add(stack);
- EtchTransportMessage* m = new EtchMessagizer(p, &u, res);
-
- //TODO: ADD FILTERS HERE
-
- if (res->get(EtchTransport<EtchSocket>::VALUE_FACTORY(), obj) != ETCH_OK) {
- c->setSession(NULL);
- p->setSession(NULL);
- m->setSession(NULL);
- delete c;
- delete p;
- delete m;
- return ETCH_ENOT_EXIST;
+ EtchTransportMessage *m = NULL;
+ status = mFactory->newTransport(mUri, res, m);
+ if (status != ETCH_OK) {
+ delete stack;
+ return status;
}
- vf->lockDynamicTypes();
CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "New stack for the accepted connection has
been created");
+
return mSession->newServer(mRuntime, m, mUri, res);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTransportFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTransportFactory.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTransportFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTransportFactory.cpp Thu
Aug 23 16:48:16 2012
@@ -61,7 +61,7 @@ status_t EtchTransportFactory::getListen
}
status_t ret = f->newListener(uri, resources, result);
- delete f;
+
return ret;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp
Thu Aug 23 16:48:16 2012
@@ -68,17 +68,12 @@ TEST(EtchClass2TypeMapTest, putTest) {
//Try to add existing field
EXPECT_EQ(ETCH_OK, test->put(EtchString::TYPE(), type));
- //Try to add a new field
- EtchType* type2 = new EtchType(EtchString("string2"));
- EXPECT_EQ(ETCH_ERANGE, test->put(EtchString::TYPE(), type2));
-
//lock the collection
test->lock();
//try to add new field
EXPECT_EQ(ETCH_EINVAL, test->put(EtchString::TYPE(), type));
delete test;
delete type;
- delete type2;
}
TEST(EtchClass2TypeMapTest, lockTest) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
Thu Aug 23 16:48:16 2012
@@ -20,7 +20,29 @@
#include "serialization/EtchValidatorString.h"
#include "serialization/EtchValidatorInt.h"
-TEST(EtchComboValidatorTest, createTest) {
+class EtchComboValidatorTest
+ : public ::testing::Test {
+protected:
+ virtual void SetUp() {
+ mRuntime = new EtchRuntime();
+ mRuntime->setLogger(new EtchLogger());
+ mRuntime->start();
+ }
+
+ virtual void TearDown() {
+ mRuntime->shutdown();
+ EtchLogger* logger = mRuntime->getLogger();
+ if(logger != NULL) {
+ delete logger;
+ }
+ delete mRuntime;
+ mRuntime = NULL;
+ }
+
+ EtchRuntime* mRuntime;
+};
+
+TEST_F(EtchComboValidatorTest, createTest) {
capu::SmartPointer<EtchValidator> ptr;
capu::SmartPointer<EtchValidator> ptr2;
@@ -32,7 +54,7 @@ TEST(EtchComboValidatorTest, createTest)
delete combo;
}
-TEST(EtchComboValidatorTest, validateTest) {
+TEST_F(EtchComboValidatorTest, validateTest) {
capu::SmartPointer<EtchObject> byte = NULL;
capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
@@ -92,7 +114,7 @@ TEST(EtchComboValidatorTest, validateTes
delete ptr;
}
-TEST(EtchComboValidatorTest, validateValueTest) {
+TEST_F(EtchComboValidatorTest, validateValueTest) {
capu::SmartPointer<EtchObject> byte = NULL;
capu::SmartPointer<EtchObject> result = NULL;
@@ -127,7 +149,7 @@ TEST(EtchComboValidatorTest, validateVal
delete ptr;
}
-TEST(EtchComboValidatorTest, elementValidatorTest) {
+TEST_F(EtchComboValidatorTest, elementValidatorTest) {
//create combo validator
EtchComboValidator *ptr = NULL;
capu::SmartPointer<EtchValidator> ptr1;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeMapTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeMapTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeMapTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeMapTest.cpp Thu
Aug 23 16:48:16 2012
@@ -41,7 +41,6 @@ TEST(EtchTypeMapTest, addTest) {
test->lock();
//try to add new type
EXPECT_EQ(ETCH_EINVAL, test->add(type));
- delete type;
delete test;
}
@@ -81,8 +80,6 @@ TEST(EtchTypeMapTest, getTest) {
EXPECT_EQ(ETCH_OK, test->get("testtype2", tmp1));
delete test;
- delete type;
- delete tmp1;
}
TEST(EtchTypeMapTest, sizeTest) {
@@ -101,7 +98,6 @@ TEST(EtchTypeMapTest, sizeTest) {
//check size
EXPECT_EQ(1, test->size());
delete test;
- delete type;
}
TEST(EtchTypeMapTest, lockTest) {
@@ -122,7 +118,6 @@ TEST(EtchTypeMapTest, lockTest) {
//check size again
EXPECT_EQ(1, test->size());
delete test;
- delete type;
}
TEST(EtchTypeMapTest, getAllTest) {
@@ -149,5 +144,4 @@ TEST(EtchTypeMapTest, getAllTest) {
}
delete test;
- delete type;
}
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp Thu Aug
23 16:48:16 2012
@@ -129,13 +129,15 @@ TEST_F(EtchRemoteBaseTest, constructorTe
EtchDeliveryService * service = NULL;
service = new EtchDefaultDeliveryService(manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory);
+ remote = new EtchRemoteBase(service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
service->setSession(&session);
delete remote;
+ delete transport;
+ delete manager;
delete service;
delete factory;
}
@@ -154,7 +156,7 @@ TEST_F(EtchRemoteBaseTest, newMessageTes
EtchDeliveryService * service = NULL;
service = new EtchDefaultDeliveryService(manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory);
+ remote = new EtchRemoteBase(service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -173,7 +175,9 @@ TEST_F(EtchRemoteBaseTest, newMessageTes
//check the assigned factory
EXPECT_TRUE(factory->factory == msg->getValueFactory());
+ delete transport;
delete remote;
+ delete manager;
delete service;
delete factory;
}
@@ -192,7 +196,7 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
EtchDeliveryService * service = NULL;
service = new EtchDefaultDeliveryService(manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory);
+ remote = new EtchRemoteBase(service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -215,7 +219,10 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
EXPECT_TRUE(remote->send(msg) == ETCH_OK);
factory->types.clear();
+
+ delete transport;
delete remote;
+ delete manager;
delete service;
delete factory;
}
@@ -234,7 +241,7 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
EtchDeliveryService * service = NULL;
service = new EtchDefaultDeliveryService(manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory);
+ remote = new EtchRemoteBase(service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -262,7 +269,10 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
EXPECT_TRUE(mail != NULL);
factory->types.clear();
+
+ delete transport;
delete remote;
+ delete manager;
delete service;
delete factory;
}
@@ -281,7 +291,7 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EtchDeliveryService * service = NULL;
service = new EtchDefaultDeliveryService(manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory);
+ remote = new EtchRemoteBase(service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -331,8 +341,11 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EXPECT_TRUE(result == data);
factory->types.clear();
+
+ delete transport;
delete mail;
delete remote;
+ delete manager;
delete service;
delete factory;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
Thu Aug 23 16:48:16 2012
@@ -142,6 +142,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, c
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
+ delete transport;
+ delete mailboxManager;
delete session;
}
@@ -190,6 +192,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
//put the stack down
mailboxManager->sessionNotify(new EtchString(EtchSession::DOWN()));
+ delete transport;
+ delete mailboxManager;
delete session;
delete factory;
}
@@ -264,6 +268,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
//check the result
EXPECT_TRUE(result->equals(data.get()));
+ delete transport;
+ delete mailboxManager;
delete session;
delete factory;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp Thu
Aug 23 16:48:16 2012
@@ -1,35 +1,35 @@
-/* $Id$
- * 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 <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include "serialization/EtchDefaultValueFactory.h"
-#include "serialization/EtchBinaryTaggedData.h"
-#include "serialization/EtchBinaryTaggedDataInput.h"
-#include "serialization/EtchValidatorShort.h"
-#include "transport/EtchMessagizer.h"
-#include "transport/EtchTcpConnection.h"
-#include "transport/EtchPacketizer.h"
-#include "transport/EtchSessionListener.h"
-#include "transport/EtchTcpListener.h"
-
-
-class MockListener11 : public virtual EtchSessionListener<EtchSocket> {
-public:
-
+/* $Id$
+ * 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 <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include "serialization/EtchDefaultValueFactory.h"
+#include "serialization/EtchBinaryTaggedData.h"
+#include "serialization/EtchBinaryTaggedDataInput.h"
+#include "serialization/EtchValidatorShort.h"
+#include "transport/EtchMessagizer.h"
+#include "transport/EtchTcpConnection.h"
+#include "transport/EtchPacketizer.h"
+#include "transport/EtchSessionListener.h"
+#include "transport/EtchTcpListener.h"
+
+
+class MockListener11 : public virtual EtchSessionListener<EtchSocket> {
+public:
+
MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
: mTransport(transport) {
if(mTransport != NULL) {
@@ -42,38 +42,38 @@ public:
delete mTransport;
}
}
-
+
//This method is called
- status_t sessionAccepted(EtchSocket* connection) {
- delete connection;
- return ETCH_OK;
- }
-
- MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
-
- MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
-
+ status_t sessionAccepted(EtchSocket* connection) {
+ delete connection;
+ return ETCH_OK;
+ }
+
+ MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
+
+ MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
+
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
private:
EtchTransport<EtchSessionListener<EtchSocket> >* mTransport;
-};
-
-class MockMailboxManager : public EtchSessionMessage {
-public:
-
- status_t sessionMessage(capu::SmartPointer<EtchWho> receipent, capu::SmartPointer<EtchMessage>
buf) {
- EXPECT_TRUE(buf->count() == 1);
+};
+
+class MockMailboxManager : public EtchSessionMessage {
+public:
+
+ status_t sessionMessage(capu::SmartPointer<EtchWho> receipent, capu::SmartPointer<EtchMessage>
buf) {
+ EXPECT_TRUE(buf->count() == 1);
buf->clear();
- return ETCH_OK;
- }
-
- MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
-
- MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
-
+ return ETCH_OK;
+ }
+
+ MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
+
+ MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
+
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
@@ -116,43 +116,48 @@ TEST_F(EtchMessagizerTest, constructorTe
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
EtchTransportPacket* pac = new EtchPacketizer(conn, &u);
EtchSessionPacket* mes = new EtchMessagizer(pac, &u, &r);
- //Created stack
- delete mes;
+
+ //Delete created stack
+ delete conn;
+ delete mes;
+ delete pac;
delete factory;
types.clear();
}
-TEST_F(EtchMessagizerTest, TransportControlTest) {
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchDefaultValueFactory * factory;
+TEST_F(EtchMessagizerTest, TransportControlTest) {
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- //created value factory
- EtchURL u("tcp://127.0.0.1:4001");
- EtchResources r;
- EtchObject *out;
+ EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ //created value factory
+ EtchURL u("tcp://127.0.0.1:4001");
+ EtchResources r;
+ EtchObject *out;
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
EtchPacketizer* pac = new EtchPacketizer(conn, &u);
EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
mess->setSession(&manager);
-
+
EtchTcpListener* transport = new EtchTcpListener(&u);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener11(transport);
transport->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new
EtchInt32(1000));
mess->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP()), new EtchInt32(1000));
- //test transport commands
+ //test transport commands
mess->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN()), new EtchInt32(1000));
transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()), new
EtchInt32(1000));
- delete mSessionListener;
- delete mess;
+ delete conn;
+ delete mSessionListener;
+ delete pac;
+ delete mess;
delete factory;
types.clear();
}
@@ -162,34 +167,36 @@ TEST_F(EtchMessagizerTest, TransportMess
EtchClass2TypeMap class2type;
EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- //default value factory
- EtchURL u("tcp://127.0.0.1:4001");
- EtchResources r;
- EtchObject *out;
- //add to the resource
+ EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ //default value factory
+ EtchURL u("tcp://127.0.0.1:4001");
+ EtchResources r;
+ EtchObject *out;
+ //add to the resource
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
EtchPacketizer* pac = new EtchPacketizer(conn, &u);
EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
mess->setSession(&manager);
- //creation of example message which will be serialized
- EtchType *mt_foo = NULL;
- EtchField mf_x("x");
- EtchString str("foo");
- factory->getType(str, mt_foo);
- capu::SmartPointer<EtchValidator> v;
- EtchValidatorShort::Get(0, v);
- mt_foo->putValidator(mf_x, v);
- capu::SmartPointer<EtchShort> data = new EtchShort(10000);
- capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
- msg->put(mf_x, data);
-
+ //creation of example message which will be serialized
+ EtchType *mt_foo = NULL;
+ EtchField mf_x("x");
+ EtchString str("foo");
+ factory->getType(str, mt_foo);
+ capu::SmartPointer<EtchValidator> v;
+ EtchValidatorShort::Get(0, v);
+ mt_foo->putValidator(mf_x, v);
+ capu::SmartPointer<EtchShort> data = new EtchShort(10000);
+ capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
+ msg->put(mf_x, data);
+
EXPECT_TRUE(mess->transportMessage(NULL, msg) == ETCH_ERROR);
- delete mess;
+ delete conn;
+ delete mess;
+ delete pac;
delete factory;
types.clear();
}
@@ -248,7 +255,9 @@ TEST_F(EtchMessagizerTest, SessionDataTe
mess->setSession(NULL);
types.clear();
- delete mMailboxManager;
- delete mess;
+ delete conn;
+ delete mMailboxManager;
+ delete pac;
+ delete mess;
delete factory;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp Thu
Aug 23 16:48:16 2012
@@ -1,36 +1,36 @@
-/* $Id$
- * 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 <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include "transport/EtchPacketizer.h"
-#include "common/EtchString.h"
-#include "common/EtchError.h"
-#include "util/EtchURL.h"
-#include "transport/EtchTcpConnection.h"
-#include "capu/util/SmartPointer.h"
-#include "common/EtchSocket.h"
-#include "transport/EtchSessionListener.h"
-#include "transport/EtchTcpListener.h"
-#include "transport/EtchSessionPacket.h"
-#include "transport/EtchFlexBuffer.h"
-
-class MockListener3 : public virtual EtchSessionListener<EtchSocket> {
-public:
-
+/* $Id$
+ * 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 <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include "transport/EtchPacketizer.h"
+#include "common/EtchString.h"
+#include "common/EtchError.h"
+#include "util/EtchURL.h"
+#include "transport/EtchTcpConnection.h"
+#include "capu/util/SmartPointer.h"
+#include "common/EtchSocket.h"
+#include "transport/EtchSessionListener.h"
+#include "transport/EtchTcpListener.h"
+#include "transport/EtchSessionPacket.h"
+#include "transport/EtchFlexBuffer.h"
+
+class MockListener3 : public virtual EtchSessionListener<EtchSocket> {
+public:
+
MockListener3(EtchTransport<EtchSessionListener<EtchSocket> >* transport) :
mTransport(transport) {
if(mTransport != NULL) {
@@ -43,34 +43,34 @@ public:
delete mTransport;
}
}
-
+
//This method is called
- status_t sessionAccepted(EtchSocket* connection) {
- delete connection;
- return ETCH_OK;
- }
-
- MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
-
- MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
-
+ status_t sessionAccepted(EtchSocket* connection) {
+ delete connection;
+ return ETCH_OK;
+ }
+
+ MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
+
+ MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
+
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
private:
EtchTransport<EtchSessionListener<EtchSocket> >* mTransport;
-};
-
-class MockMessagizer : public EtchSessionPacket {
-public:
-
- MOCK_METHOD2(sessionPacket, status_t(capu::SmartPointer<EtchWho> receipent, capu::SmartPointer<EtchFlexBuffer>
buf));
-
- MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
-
- MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
-
+};
+
+class MockMessagizer : public EtchSessionPacket {
+public:
+
+ MOCK_METHOD2(sessionPacket, status_t(capu::SmartPointer<EtchWho> receipent, capu::SmartPointer<EtchFlexBuffer>
buf));
+
+ MOCK_METHOD2(sessionQuery, status_t(capu::SmartPointer<EtchObject> query, capu::SmartPointer<EtchObject>
&result));
+
+ MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject>
value));
+
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
@@ -102,7 +102,10 @@ TEST_F(EtchPacketizerTest, constructorTe
EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
EtchSessionData* packetizer = new EtchPacketizer(conn, &u);
- delete packetizer;
+
+ delete conn;
+ delete packetizer;
+
}
TEST_F(EtchPacketizerTest, TransportControlTest) {
@@ -112,18 +115,18 @@ TEST_F(EtchPacketizerTest, TransportCont
MockMessagizer mes;
packetizer->setSession(&mes);
-
EtchTcpListener* transport = new EtchTcpListener(&u);
EtchSessionListener<EtchSocket>* listener = new MockListener3(transport);
- //Start the mock listener
+ //Start the mock listener
transport->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new
EtchInt32(1000));
-
+
packetizer->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP()), new
EtchInt32(1000));
packetizer->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN()), new
EtchInt32(1000));
-
+
transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()), new
EtchInt32(1000));
-
+
+ delete conn;
delete packetizer;
delete listener;
}
@@ -142,6 +145,8 @@ TEST_F(EtchPacketizerTest, TransportPack
buffer->setIndex(0);
EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
+
+ delete conn;
delete packetizer;
}
@@ -151,21 +156,22 @@ TEST_F(EtchPacketizerTest, SessionDataTe
EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
//A packet is created
- capu::int32_t pktsize = 4;
+ capu::int32_t pktsize = 4;
buffer->putInt(packetizer->SIG());
buffer->putInt(pktsize);
- buffer->put((capu::int8_t *)"test", pktsize);
- buffer->setIndex(0);
- EXPECT_TRUE(buffer->getLength() == 12);
-
- EtchSessionPacket* mSessionPacker = new MockMessagizer();
- packetizer->setSession(mSessionPacker);
-
- MockMessagizer * mock = (MockMessagizer*) mSessionPacker;
- EXPECT_CALL(*mock, sessionPacket(capu::SmartPointer<EtchWho > (NULL), buffer));
- EXPECT_TRUE(packetizer->sessionData(NULL, buffer) == ETCH_OK);
-
- packetizer->setSession(NULL);
- delete mSessionPacker;
- delete packetizer;
+ buffer->put((capu::int8_t *)"test", pktsize);
+ buffer->setIndex(0);
+ EXPECT_TRUE(buffer->getLength() == 12);
+
+ EtchSessionPacket* mSessionPacker = new MockMessagizer();
+ packetizer->setSession(mSessionPacker);
+
+ MockMessagizer * mock = (MockMessagizer*) mSessionPacker;
+ EXPECT_CALL(*mock, sessionPacket(capu::SmartPointer<EtchWho > (NULL), buffer));
+ EXPECT_TRUE(packetizer->sessionData(NULL, buffer) == ETCH_OK);
+
+ packetizer->setSession(NULL);
+ delete mSessionPacker;
+ delete packetizer;
+ delete conn;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
(original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
Thu Aug 23 16:48:16 2012
@@ -126,6 +126,7 @@ TEST_F(EtchPlainMailboxManagerTest, cons
EXPECT_TRUE(manager != NULL);
manager->setSession(&session);
+ delete transport;
delete manager;
delete factory;
}
@@ -165,6 +166,8 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EXPECT_TRUE(ETCH_OK != manager->getMailbox(id, mail));
message->clear();
+
+ delete transport;
delete manager;
delete factory;
}
@@ -207,6 +210,8 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EXPECT_TRUE(ETCH_OK != manager->getMailbox(id, mail));
message->clear();
+
+ delete transport;
delete manager;
delete factory;
}
@@ -248,6 +253,8 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EXPECT_TRUE(ETCH_OK == manager->getMailbox(id, mail));
message->clear();
+
+ delete transport;
delete manager;
delete factory;
}
@@ -293,6 +300,8 @@ TEST_F(EtchPlainMailboxManagerTest, repl
EXPECT_TRUE(ETCH_OK != manager->getMailbox(id, mail));
message->clear();
+
+ delete transport;
delete manager;
delete factory;
}
@@ -354,6 +363,7 @@ TEST_F(EtchPlainMailboxManagerTest, sess
//deallocations
delete x;
+ delete transport;
delete manager;
delete factory;
}
Modified: incubator/etch/trunk/examples/helloworld/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/CMakeLists.txt?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/CMakeLists.txt (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/CMakeLists.txt Thu Aug 23 16:48:16 2012
@@ -21,6 +21,9 @@
cmake_minimum_required (VERSION 2.8)
project (etch-cpp-helloworld)
+IF (EXISTS "${CMAKE_SOURCE_DIR}/CMakeLists_local.txt")
+ INCLUDE ("${CMAKE_SOURCE_DIR}/CMakeLists_local.txt" OPTIONAL)
+ENDIF()
IF(UNIX)
add_definitions("-DOS_LINUX")
@@ -116,6 +119,12 @@ target_link_libraries(etch-cpp-helloworl
set_target_properties(etch-cpp-helloworld-server PROPERTIES COMPILE_FLAGS "-m32 -g" LINK_FLAGS
"-m32")
ELSEIF(WIN32)
target_link_libraries(etch-cpp-helloworld-server ${ETCH_LIBRARY} ${CAPU_LIBRARY})
+IF (BUILD_CHECK_MEMORY)
+ file (COPY ${VLD}/vld.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ file (COPY ${VLD}/bin/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ file (COPY ${VLD}/bin/vld.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ target_link_libraries (etch-cpp-helloworld-server ${VLD}/lib/vld.lib)
+ENDIF (BUILD_CHECK_MEMORY)
ENDIF ()
set_target_properties(etch-cpp-helloworld-server PROPERTIES OUTPUT_NAME "helloworld-server")
@@ -147,6 +156,12 @@ target_link_libraries(etch-cpp-helloworl
set_target_properties(etch-cpp-helloworld-client PROPERTIES COMPILE_FLAGS "-m32 -g" LINK_FLAGS
"-m32")
ELSEIF(WIN32)
target_link_libraries(etch-cpp-helloworld-client ${ETCH_LIBRARY} ${CAPU_LIBRARY})
+IF (BUILD_CHECK_MEMORY)
+ file (COPY ${VLD}/vld.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ file (COPY ${VLD}/bin/dbghelp.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ file (COPY ${VLD}/bin/vld.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE})
+ target_link_libraries (etch-cpp-helloworld-client ${VLD}/lib/vld.lib)
+ENDIF (BUILD_CHECK_MEMORY)
ENDIF ()
set_target_properties(etch-cpp-helloworld-client PROPERTIES OUTPUT_NAME "helloworld-client")
Modified: incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp Thu
Aug 23 16:48:16 2012
@@ -12,7 +12,9 @@
#include "MainHelloWorldClient.h"
#include "ImplHelloWorldClient.h"
#include "transport/EtchTransportData.h"
-
+#ifdef BUILD_CHECK_MEMORY
+#include "vld.h"
+#endif
using namespace org_apache_etch_examples_helloworld_HelloWorld;
@@ -64,6 +66,9 @@ capu::int32_t main(int argc, const char*
// Disconnect from the service
remote->transportControl(new EtchString(EtchTransportData::STOP_AND_WAIT_DOWN()), new
EtchInt32(4000));
+ //delete remote
+ delete remote;
+
//delete runtime
result = runtime->shutdown();
if (result != ETCH_OK) {
Modified: incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldListener.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldListener.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldListener.cpp (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldListener.cpp Thu
Aug 23 16:48:16 2012
@@ -6,16 +6,18 @@
// overwritten once it exists! Please edit this file as necessary to implement
// your service logic.
+#include "MainHelloWorldListener.h"
+#include "ImplHelloWorldServer.h"
+#include "RemoteHelloWorldClient.h"
+
#include "capu/os/Thread.h"
#include "common/EtchTypes.h"
#include "support/EtchRuntime.h"
-#include "RemoteHelloWorldClient.h"
-#include "MainHelloWorldListener.h"
-#include "ImplHelloWorldServer.h"
#include "transport/EtchTransportData.h"
-#include "util/EtchLogger.h"
-
+#ifdef BUILD_CHECK_MEMORY
+#include "vld.h"
+#endif
using namespace org_apache_etch_examples_helloworld_HelloWorld;
@@ -36,13 +38,6 @@ int main(int argc, const char* argv[])
EtchRuntime* runtime = new EtchRuntime();
status = runtime->start();
- EtchLogger* logger = new EtchLogger();
- EtchAppender* appender = new EtchConsoleAppender();
- appender->setLoggingLevel(capu::CLL_TRACE);
- logger->setAppender(appender);
- EtchRuntime::setLogger(logger);
-
-
// TODO Change to correct URI
EtchString uri("tcp://0.0.0.0:4001");
@@ -52,21 +47,29 @@ int main(int argc, const char* argv[])
status = HelloWorldHelper::newListener(runtime, uri, NULL, &mainHelloWorldlistener,
listener);
- // Start the Listener
+ //start the Listener
status = listener->transportControl(new EtchString(EtchTransportData::START_AND_WAIT_UP()),
new EtchInt32(4000));
+ if (status == ETCH_OK) {
+ printf("Hello World Server started successfully. Listening on port 4001\n\n");
+ } else {
+ printf("Error while starting Hello World Server. Errorcode %d \n\n", status);
+ return -1;
+ }
+
+ //waiting
+ printf("press any key to stop server\n");
+ getchar();
- //Wait for finish...
- capu::Thread::Sleep(200000);
-
- //Stop the Listener
+ //stop the Listener
listener->transportControl(new EtchString(EtchTransportData::STOP_AND_WAIT_DOWN()),
new EtchInt32(4000));
+ //delete listener
+ delete listener;
+
//delete runtime
status = runtime->shutdown();
-
+
delete runtime;
- delete logger;
- delete appender;
return 0;
}
Author: veithm
Date: Thu Aug 23 16:48:16 2012
New Revision: 1376588
URL: http://svn.apache.org/viewvc?rev=1376588&view=rev
Log:
ETCH-198 Changes in helper and valuefactory
Refactoring of life cycle and memory management
Change-Id: If74bb9e43e0712fb8dca8cf52d364efa3d5d12a3
Added:
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h (contents, props changed)
- copied, changed from r1376587, incubator/etch/trunk/binding-cpp/runtime/include/support/EtchClientStack.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h (contents, props changed)
- copied, changed from r1376587, incubator/etch/trunk/binding-cpp/runtime/include/support/EtchServerStack.h
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp (with props)
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp (contents, props changed)
- copied, changed from r1376587, incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchClientStack.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp (contents, props changed)
- copied, changed from r1376587, incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchServerStack.cpp
Removed:
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchClientStack.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchServerStack.h
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchClientStack.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchServerStack.cpp
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/Windows/ServerSocket.inc
incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTransportFactory.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeMapTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
incubator/etch/trunk/examples/helloworld/cpp/CMakeLists.txt
incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp
incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldListener.cpp
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/java/org/apache/etch/bindings/cpp/compiler/Compiler.java Thu Aug 23 16:48:16 2012
@@ -1186,7 +1186,7 @@ public class Compiler extends Backend {
Token t = type.type();
switch (t.kind) {
case EtchGrammarConstants.BOOLEAN:
- return "EtchBool";
+ return "Bool";
case EtchGrammarConstants.BYTE:
return "Byte";
case EtchGrammarConstants.SHORT:
@@ -1202,7 +1202,7 @@ public class Compiler extends Backend {
case EtchGrammarConstants.STRING:
return "String";
case EtchGrammarConstants.OBJECT:
- return "";
+ return "Object";
default: {
// we have to use a fully qualified name here.
// find the actual type...
@@ -1258,7 +1258,11 @@ public class Compiler extends Backend {
// TODO Auto-generated method stub
if(pointer)
return "EtchNativeArray" + this.getNativeArrayTypeName( type ) + "Ptr";
- return "EtchNativeArray" + this.getNativeArrayTypeName( type ) + "Obj";
+ if (type.type().kind == EtchGrammarConstants.BYTE) {
+ return "EtchNativeArray<" + this.getNativeTypeName( type, true ) + "> ";
+ } else {
+ return "EtchNativeArray<" + this.getNativeTypeName( type, true ) + "Ptr> ";
+ }
}
public String getNativeTypeName(TypeRef type, boolean etch_type) {
@@ -1269,7 +1273,7 @@ public class Compiler extends Backend {
case EtchGrammarConstants.BOOLEAN:
return (etch_type ? "EtchBool" : "capu::bool_t");
case EtchGrammarConstants.BYTE:
- return (etch_type ? "EtchByte" : "capu::int8_t");
+ return (etch_type ? "capu::int8_t" : "capu::int8_t");
case EtchGrammarConstants.SHORT:
return (etch_type ? "EtchShort" : "capu::int16_t");
case EtchGrammarConstants.INT:
@@ -1295,7 +1299,10 @@ public class Compiler extends Backend {
if (n.isBuiltin()) {
Builtin b = (Builtin) n;
if (n.efqname(this).equals("EtchDate")) return b.className();
- return b.className() + "Obj";
+ if (n.efqname(this).equals("EtchHashTable")) return b.className()+"<EtchObjectPtr, EtchObjectPtr> ";
+ if (n.efqname(this).equals("EtchHashSet")) return b.className()+"<EtchObjectPtr> ";
+ throw new IllegalArgumentException(String.format(
+ "unable to find correct Etch data type for type at line %d: %s", t.beginLine, n.efqname(this)));
}
if (n.isEnumx()) {
return n.efqname(this);
@@ -1494,8 +1501,13 @@ public class Compiler extends Backend {
Builtin b = (Builtin) n;
String cn = b.className();
- if (!n.efqname(this).equals("EtchDate"))
- cn += "Obj";
+ if (n.efqname(this).equals("EtchHashTable")) {
+ cn += "<EtchObjectPtr, EtchObjectPtr>";
+ }
+ if (n.efqname(this).equals("EtchHashSet")) {
+ cn += "<EtchObjectPtr>";
+ }
+
/*
* int i = cn.indexOf( '<' ); if (i >= 0) cn = cn.substring( 0, i );
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_cpp.vm Thu Aug 23 16:48:16 2012
@@ -35,12 +35,8 @@
#end
\#include "support/EtchRuntime.h"
-#if($helper.isServer($mc) || $helper.isBoth($mc))
-\#include "support/EtchServerStack.h"
-#end
-#if($helper.isClient($mc) || $helper.isBoth($mc))
-\#include "support/EtchClientStack.h"
-#end
+\#include "support/EtchStackClient.h"
+\#include "support/EtchStackServer.h"
\#include "support/EtchPool.h"
\#include "transport/EtchPlainMailboxManager.h"
\#include "transport/EtchDefaultDeliveryService.h"
@@ -61,6 +57,10 @@ $clname::Listener${i}Server::~Listener${
status_t $clname::Listener${i}Server::newServer(EtchRuntime* runtime, EtchTransportMessage* transport, const EtchString& uri, EtchResources* resources)
{
+ //get stack instance
+ EtchStackServer* stack = NULL;
+ resources->get(EtchStack::STACK(), (EtchObject*&)stack );
+
//get value factory
EtchObject* obj;
resources->get( EtchTransport<EtchValueFactory*>::VALUE_FACTORY(), obj );
@@ -68,8 +68,11 @@ status_t $clname::Listener${i}Server::ne
//create stack layers
EtchMailboxManager* mbm = new EtchPlainMailboxManager(transport, uri, resources);
+ stack->setMailboxManager(mbm);
EtchDeliveryService* dvs = new EtchDefaultDeliveryService(mbm, uri);
- Remote${i}Client* client = new Remote${i}Client(runtime, dvs, vf);
+ stack->setDeliveryService(dvs);
+ Remote${i}Client* client = new Remote${i}Client(runtime, dvs, vf, stack);
+ stack->setRemote(client);
${i}Server* server = mFactory->new${i}Server(client);
//get thread pools
@@ -81,7 +84,9 @@ status_t $clname::Listener${i}Server::ne
//create stub
Stub${i}Server* tmp${i}Server = new Stub${i}Server(dvs, server, qp, fp);
- EtchStack* stack = new EtchServerStack(client, tmp${i}Server, resources, vf);
+ stack->setStub(tmp${i}Server);
+
+ //start remote client
client->start();
return ETCH_OK;
}
@@ -117,7 +122,7 @@ status_t $clname::newListener(EtchRuntim
status_t status = ETCH_OK;
//static initialization of value factory
- ValueFactory${i}::__INIT(runtime);
+ ValueFactory${i}::InitValueFactory(runtime);
//init resources
EtchResources *res;
@@ -159,8 +164,10 @@ status_t $clname::newListener(EtchRuntim
{
status_t status = ETCH_OK;
+ EtchStackClient* stack = new EtchStackClient();
+
//static initialization of value factory
- ValueFactory${i}::__INIT(runtime);
+ ValueFactory${i}::InitValueFactory(runtime);
//init resources
EtchResources* res;
@@ -169,6 +176,10 @@ status_t $clname::newListener(EtchRuntim
return status;
}
+ EtchObject* tmp = NULL;
+ res->put(EtchStack::STACK(),stack, tmp);
+ stack->mStaticResources = res;
+
//create valuefactory instance
ValueFactory${i}* vf = new ValueFactory${i}(uri);
EtchObject* vfobj = (EtchObject*) vf;
@@ -180,8 +191,10 @@ status_t $clname::newListener(EtchRuntim
EtchTransportMessage* m;
EtchTransportFactory::getTransport(runtime, uri, res, m);
EtchMailboxManager* mbm = new EtchPlainMailboxManager(m, uri, res);
+ stack->setMailboxManager(mbm);
EtchDeliveryService* dvs = new EtchDefaultDeliveryService(mbm, uri);
- Remote${i}Server* _server = new Remote${i}Server(runtime, dvs, vf);
+ stack->setDeliveryService(dvs);
+ Remote${i}Server* _server = new Remote${i}Server(runtime, dvs, vf, stack);
${i}Client* client = implFactory.new${i}Client( server );
//get pools
@@ -193,7 +206,7 @@ status_t $clname::newListener(EtchRuntim
//init stub
Stub${i}Client* tmpStub${i}Client = new Stub${i}Client(dvs, client, qp, fp);
- EtchStack* stack = new EtchClientStack(server, tmpStub${i}Client, res, vf);
+ stack->setStub(tmpStub${i}Client);
//return server
server = _server;
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm Thu Aug 23 16:48:16 2012
@@ -147,7 +147,7 @@ private:
#end
#if($helper.isClient($mc) || $helper.isBoth($mc))
- static status_t newServer(EtchRuntime* runtime, EtchString uri, EtchResources* resources, ${i}ClientFactory& implFactory, RemoteHelloWorldServer*& server);
+ static status_t newServer(EtchRuntime* runtime, EtchString uri, EtchResources* resources, ${i}ClientFactory& implFactory, Remote${i}Server*& server);
#end
};
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/intf_h.vm Thu Aug 23 16:48:16 2012
@@ -98,7 +98,7 @@ namespace $namespace {
* $s
#end
*/
- $i.name()#if($enumHelper < $count),#end
+ $n.name()_$i.name()#if($enumHelper < $count),#end
#end
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm Thu Aug 23 16:48:16 2012
@@ -70,7 +70,7 @@ status_t $clname::$n.name()AsyncResultRe
return ETCH_OK;
}
-$intfname::$n.name()AsyncResultPtr $clname::$n.name()AsyncResultRemote::Begin($clname* base, #set($sep = "")#foreach($p in $n.iterator())$sep$helper.getEtchTypeName($p.type(), true) $p.name()#set($sep = ", ")#end) {
+$intfname::$n.name()AsyncResultPtr $clname::$n.name()AsyncResultRemote::Begin($clname* base#set($sep = ", ")#foreach($p in $n.iterator())$sep$helper.getEtchTypeName($p.type(), true) $p.name()#end) {
status_t status;
capu::SmartPointer<EtchMessage> msg;
@@ -108,11 +108,11 @@ $intfname::$n.name()AsyncResultPtr $clna
* @param vf
*/
#if($hasBaseClass)
-$clname::$clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf )
- : Remote${i}(runtime, svc, vf) {
+$clname::$clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack )
+ : Remote${i}(runtime, svc, vf, stack) {
#else
-$clname::$clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf )
- : EtchRemoteBase(svc, vf), mRuntime(runtime) {
+$clname::$clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack )
+ : EtchRemoteBase(svc, vf, stack), mRuntime(runtime) {
#end
}
@@ -131,7 +131,7 @@ $intfname::$n.name()AsyncResultPtr $clna
}
#else
$intfname::$n.name()AsyncResultPtr $clname::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator() )$sep$helper.getEtchTypeName( $p.type(), true ) $p.name() #set( $sep = ", " )#end) {
- $n.name()AsyncResultPtr result = $clname::$n.name()AsyncResultRemote::Begin(this, #set($sep = "")#foreach($p in $n.iterator())$p.name() #set( $sep = ", ")#end);
+ $n.name()AsyncResultPtr result = $clname::$n.name()AsyncResultRemote::Begin(this#set( $sep = ", ")#foreach($p in $n.iterator())$sep$p.name()#end);
return result;
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm Thu Aug 23 16:48:16 2012
@@ -33,7 +33,7 @@
#if(!$hasBaseClass)
\#include "support/EtchRemoteBase.h"
#else
-\#include "ValueFactoryHelloWorld.h"
+\#include "${vfname}.h"
\#include "$inc"
\#include "Remote${i}.h"
#end
@@ -79,7 +79,7 @@ namespace $namespace {
/**
* Create a new instance from $clname class
*/
- static $n.name()AsyncResultPtr Begin($clname* base, #set($sep = "")#foreach($p in $n.iterator())$sep$helper.getEtchTypeName($p.type(), true) $p.name()#set($sep = ", ")#end);
+ static $n.name()AsyncResultPtr Begin($clname* base#set($sep = ", ")#foreach($p in $n.iterator())$sep$helper.getEtchTypeName($p.type(), true) $p.name()#end);
private:
$clname* mBase;
@@ -94,8 +94,9 @@ namespace $namespace {
*
* @param svc
* @param vf
+ * @param stack
*/
- $clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf );
+ $clname(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack );
/**
* Destructor
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm Thu Aug 23 16:48:16 2012
@@ -143,33 +143,33 @@ namespace $namespace {
{
}
virtual ~Stub$i$suffix() {}
- static void init()
- {
- // nothing to do.
- }
-
+
##if($notEmpty)
- /*
- * Static Initialization-Helper
- */
+
private:
friend class ValueFactory${i};
- static void __INIT()
+
+ /**
+ * Static Initialization-Helper
+ */
+ static status_t Init()
{
-#foreach( $mthd in $intf.iterator() )
-#if ($mthd.isMsgDir($mc))
-#if (!$mthd.isHidden())
- ValueFactory$i::${mthd.vname( $helper )}->setStubHelper(new Run${mthd.vname($helper)}());
-#end
-#end
-#if( $n.isMixin() )
-#set( $m = $n.getModule() )
-#set( $z = $m.iterator().next() )
- ${m.name()}::Stub${z.name()}${suffix}::init();
-#end
-#end
+ #foreach( $mthd in $intf.iterator() )
+ #if ($mthd.isMsgDir($mc))
+ #if (!$mthd.isHidden())
+ ValueFactory$i::${mthd.vname( $helper )}->setStubHelper(new Run${mthd.vname($helper)}());
+ #end
+ #end
+ #if( $n.isMixin() )
+ #set( $m = $n.getModule() )
+ #set( $z = $m.iterator().next() )
+ ${m.name()}::Stub${z.name()}${suffix}::Init();
+ #end
+ #end
+ return ETCH_OK;
}
+
##end
};
}
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm Thu Aug 23 16:48:16 2012
@@ -26,17 +26,37 @@
#set( $vf = "ValueFactory$intf.name()" )
\#include "$inc"
+\#include "${intf.name()}.h"
+\#include "Stub${i}Server.h"
+\#include "Stub${i}Client.h"
\#include "common/EtchError.h"
\#include "serialization/EtchField.h"
\#include "serialization/EtchAsyncMode.h"
\#include "serialization/EtchDirection.h"
-\#include "${intf.name()}.h"
\#include "serialization/EtchValidators.h"
-\#include "Stub${i}Server.h"
-\#include "Stub${i}Client.h"
using namespace $namespace;
+status_t $vf::Etch${intf.name()}RuntimeListener::onRuntimeChanged(EtchRuntime* runtime) {
+ capu::int_t index = $vf::SRuntimes.find(runtime->getId());
+ if (index == -1) {
+ return ETCH_ERROR;
+ }
+ if (runtime->isClosed()) {
+ //the runtime is closed and is removed
+ $vf::SRuntimes.removeAt(index);
+ }
+ if ($vf::SRuntimes.isEmpty()) {
+ //clean up all static members
+ $vf::DestroyValueFactory();
+ }
+ return ETCH_OK;
+}
+
+capu::Mutex $vf::SRuntimesMutex;
+capu::List<capu::uint64_t> $vf::SRuntimes;
+$vf::Etch${intf.name()}RuntimeListener $vf::S${intf.name()}RuntimeListener;
+
##--------------------------------------------------------------
## Classes that represent anonym creation in java
##--------------------------------------------------------------
@@ -90,7 +110,7 @@ class ImportExportHelper$n.vname( $helpe
switch (v->Value)
{
#foreach ($p in $n.iterator())
- case $tname::$p.name(): _struct->put($vf::$p.vname($helper)(), new EtchBool(true) ); break;
+ case $tname::${tname}_$p.name(): _struct->put($vf::$p.vname($helper)(), new EtchBool(true) ); break;
#end
}
result = _struct;
@@ -105,11 +125,14 @@ class ImportExportHelper$n.vname( $helpe
return ETCH_EINVAL;
// there should only be a single key, so take the first one
- EtchField key = value->getFirstField();
+ EtchHashTable<EtchField, capu::SmartPointer<EtchObject> >::Iterator it = value->begin();
+ EtchHashTable<EtchField, capu::SmartPointer<EtchObject> >::Pair pair;
+ it.next(&pair);
+ EtchField key = pair.first;
#foreach ($p in $n.iterator())
if (key.equals(&$vf::$p.vname($helper)()))
{
- result = new ${tname}(${tname}::$p.name());
+ result = new ${tname}(${tname}::${tname}_$p.name());
return ETCH_OK;
}
#end
@@ -170,16 +193,17 @@ ${vf}::${vf}( EtchString uri ) : EtchDef
#end
}
-void ${vf}::initTypes()
+status_t ${vf}::InitTypes()
{
#foreach ( $n in $intf.iterator() )
#if ($n.isEnumx() || $n.isStruct() || $n.isExtern() || $n.isExcept() || $n.isMessage())
types()->get(EtchString("$n.fqname()"), ${vf}::${n.vname( $helper )});
#end
#end
+ return ETCH_OK;
}
-void ${vf}::initResults()
+status_t ${vf}::InitResults()
{
//AF: TO-REVIEW: finde die Verwendung von Anonymer Enum bei EchtDirection und bei EtchAsyncMode unschoen
@@ -202,10 +226,11 @@ void ${vf}::initResults()
#end
#end
#end
+ return ETCH_OK;
}
## ----------------------------- import / export -----------------------------
-void ${vf}::initImportExport()
+status_t ${vf}::InitImportExport()
{
#foreach ( $n in $intf.iterator() )
#if ($n.isStruct() || $n.isExcept())
@@ -225,11 +250,13 @@ void ${vf}::initImportExport()
$vf::${n.vname( $helper )}->setImportExportHelper(new ImportExportHelper$n.vname($helper)());
#end
#end
+
+ return ETCH_OK;
}
## ----------------------------- fields -----------------------------
-void ${vf}::initFields()
+status_t ${vf}::InitFields()
{
#set( $x = $params.clear() )
## standard params from DefaultValueFactory
@@ -245,24 +272,17 @@ void ${vf}::initFields()
#end
#end
#end
+ return ETCH_OK;
}
#set( $ctr = 0 )
-void $vf::initParams()
+status_t $vf::InitParams()
{
capu::SmartPointer<EtchValidator> tmpValue;
#foreach( $n in $intf.iterator() )
#if ($n.isEnumx() || $n.isStruct() || $n.isExcept() || $n.isMessage())
-#if ($ctr > 0 && $ctr % 100 == 0)
- initParams${ctr}();
-}
-
-void $vf::initParams${ctr}()
-{
- capu::SmartPointer<EtchValidator> tmpValue;
-#end
#set( $ctr = $ctr + 1 )
// params for $n.name()
#if ($n.isStruct() || $n.isExcept())
@@ -270,14 +290,14 @@ void $vf::initParams${ctr}()
$helper.getValidator($param);
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue);
-#end
+#end ## -- foreach --
#else
#foreach( $param in $n.iterator() )
$helper.getValidator($param);
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue);
-#end
-#end
+#end ## -- foreach --
+#end ## -- else --
#if ($n.isMessage())
EtchValidatorLong::Get(0, tmpValue);
${n.vname( $helper )}->putValidator($vf::_mf__messageId(), tmpValue);
@@ -289,52 +309,104 @@ void $vf::initParams${ctr}()
$helper.getValidator($t)
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue); // thrown $t.name()
-#end
+#end ## -- foreach --
EtchValidatorRuntimeException::Get(tmpValue);
$vf::${n.vname( $helper )}->putValidator($vf::$param.vname($helper)(), tmpValue); // thrown RuntimeException
EtchValidatorLong::Get(0, tmpValue);
$vf::${n.vname( $helper )}->putValidator($vf::_mf__inReplyTo(), tmpValue);
+#end ## -- isHidden --
+#end ## -- isMessage --
+#end ## -- $n.isEnumx() || $n.isStruct() || $n.isExcept() || $n.isMessage() --
+#end ## -- foreach --
-#end
-#end
-#end
-#end
+ return ETCH_OK;
}
-void $vf::__ShutDown()
+status_t $vf::InitValueFactory(EtchRuntime* runtime)
{
- $vf::types()->clear();
- delete $vf::types();
- delete $vf::class2type();
-}
+ status_t status;
+ SRuntimesMutex.lock();
+ if (SRuntimes.find(runtime->getId()) != -1) {
+ //runtime is already in list
+ return ETCH_OK;
+ }
-/**
- * Static Initialization-Helper
- */
-bool $vf::INIT = false;
-void $vf::__INIT(EtchRuntime* runtime)
-{
- if(INIT)
- return;
- INIT = true;
- $vf::Init( types(), class2type() );
- $vf::initTypes();
- $vf::initResults();
- $vf::initFields();
+ status = SRuntimes.add(runtime->getId());
+ runtime->registerListener(&S${i}RuntimeListener);
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ if (SRuntimes.size() > 1) {
+ //Valuefactory is already initialized
+ SRuntimesMutex.unlock();
+ return ETCH_OK;
+ }
+ SRuntimesMutex.unlock();
+
+ status = $vf::Init( types(), class2type() );
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = $vf::InitTypes();
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = $vf::InitResults();
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = $vf::InitFields();
+ if (status != ETCH_OK) {
+ return status;
+ }
#foreach( $n in $intf.iterator() )
#if ($n.isExtern())
- ${n.sname( $helper )}.init( ${n.vname($helper)}(), class2type );
+ status = ${n.sname( $helper )}.Init( ${n.vname($helper)}(), class2type );
+ if (status != ETCH_OK) {
+ return status;
+ }
#end
#end
- $vf::initParams();
- $vf::initImportExport();
+ status = $vf::InitParams();
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = $vf::InitImportExport();
+ if (status != ETCH_OK) {
+ return status;
+ }
- Stub${i}<void>::__INIT();
- Stub${i}Server::__INIT();
- Stub${i}Client::__INIT();
+ status = Stub${i}<void>::Init();
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = Stub${i}Server::Init();
+ if (status != ETCH_OK) {
+ return status;
+ }
+
+ status = Stub${i}Client::Init();
+ if (status != ETCH_OK) {
+ return status;
+ }
// done updating types, and class2type: lock them.
types()->lock();
class2type()->lock();
+
+ return ETCH_OK;
+}
+status_t $vf::DestroyValueFactory()
+{
+ $vf::types()->clear();
+ delete $vf::types();
+ delete $vf::class2type();
+ return ETCH_OK;
}
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm (original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_h.vm Thu Aug 23 16:48:16 2012
@@ -26,6 +26,8 @@
#ifndef __$helper.getVfName($intf).toUpperCase()_H__
\#define __$helper.getVfName($intf).toUpperCase()_H__
+\#include "capu/os/Mutex.h"
+\#include "capu/container/List.h"
\#include "common/EtchTypes.h"
\#include "serialization/EtchDefaultValueFactory.h"
\#include "support/EtchRuntime.h"
@@ -74,29 +76,44 @@ namespace $namespace {
static EtchTypeMap* types();
static EtchClass2TypeMap* class2type();
- static void initTypes();
- static void initResults();
- static void initFields();
- static void initParams();
+ static status_t InitTypes();
+ static status_t InitResults();
+ static status_t InitFields();
+ static status_t InitParams();
#set( $ctr = 0 )
#foreach( $n in $intf.iterator() )
#if ($n.isEnumx() || $n.isStruct() || $n.isExcept() || $n.isMessage())
#if ($ctr > 0 && $ctr % 100 == 0)
- static void initParams${ctr}();
+ static status_t InitParams${ctr}();
#end
#set( $ctr = $ctr + 1 )
#end
#end
- static void initImportExport();
+ static status_t InitImportExport();
/**
* Static Initialization-Helper
*/
private:
+ /**
+ * Listener which reacts to changes in runtime
+ * Destroys the statically initialized members if the last runtime has been deleted
+ */
+ class Etch${i}RuntimeListener : public EtchRuntimeListener {
+ /**
+ * @see EtchRuntime
+ */
+ status_t onRuntimeChanged(EtchRuntime* runtime);
+ };
+
friend class ${i}Helper;
- static void __ShutDown();
- static bool INIT;
- static void __INIT(EtchRuntime* runtime);
+ friend class Etch${i}RuntimeListener;
+ static status_t InitValueFactory(EtchRuntime* runtime);
+ static status_t DestroyValueFactory();
+ static capu::Mutex SRuntimesMutex;
+ static capu::List<capu::uint64_t> SRuntimes;
+ static Etch${i}RuntimeListener S${i}RuntimeListener;
+
};
}
#endif
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObjectType.h Thu Aug 23 16:48:16 2012
@@ -71,6 +71,9 @@ enum EtchObjectTypeIds {
EOTID_STUBHELPER,
EOTID_VALIDATOR_CUSTOM,
EOTID_VALIDATOR_CUSTOM_KEY,
+ EOTID_STACK,
+ EOTID_STACK_CLIENT,
+ EOTID_STACK_SERVER,
EOTID_DYNAMIC_START
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/serialization/EtchDefaultValueFactory.h Thu Aug 23 16:48:16 2012
@@ -98,7 +98,7 @@ protected:
public:
- static void Init(EtchTypeMap* types, EtchClass2TypeMap* class2type);
+ static status_t Init(EtchTypeMap* types, EtchClass2TypeMap* class2type);
/**
* The msg field of the standard unchecked exception.
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchRemoteBase.h Thu Aug 23 16:48:16 2012
@@ -24,6 +24,7 @@
#include "common/EtchTypes.h"
#include "support/EtchDeliveryService.h"
+#include "support/EtchStack.h"
#include "serialization/EtchValueFactory.h"
class EtchRuntime;
@@ -39,7 +40,7 @@ public:
* @param svc the delivery service used to send messages.
* @param vf the value factory used to create messages and encode/decode types.
*/
- EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf);
+ EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack);
/**
* Destructor
@@ -189,6 +190,7 @@ public:
private:
EtchRuntime* mRuntime;
EtchDeliveryService * mSvc;
+ EtchStack* mStack;
EtchValueFactory* mVf;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStack.h Thu Aug 23 16:48:16 2012
@@ -16,11 +16,133 @@
*/
#ifndef ETCHSTACK_H
-#define ETCHSTACK_H
+#define ETCHSTACK_H
-class EtchStack {
+#include "support/EtchStubBase.h"
+#include "transport/EtchTransportData.h"
+#include "transport/EtchTransportPacket.h"
+#include "transport/EtchTransportMessage.h"
+#include "transport/EtchPlainMailboxManager.h"
+#include "transport/EtchDefaultDeliveryService.h"
+#include "serialization/EtchValueFactory.h"
+#include "util/EtchResources.h"
+
+/* *
+ * This class serves as a container for all layers created during the setup of a new stack (connection, packetizer, messagizer, ...).
+ */
+class EtchStack : public EtchObject{
public:
- virtual ~EtchStack() {}
+
+ /**
+ * EtchObjectType for EtchStack.
+ */
+ static const EtchObjectType* TYPE();
+
+ /**
+ * Resource identifier
+ */
+ const static EtchString& STACK();
+
+ /**
+ * Default Constructor
+ */
+ EtchStack();
+
+ /**
+ * Destructor which cleans the whole stack
+ */
+ virtual ~EtchStack();
+
+ /**
+ * sets the transport interface
+ */
+ void setTransportData(EtchTransportData* transportData);
+
+ /**
+ * sets the packet interface
+ */
+ void setTransportPacket(EtchTransportPacket* transportPacket);
+
+ /**
+ * sets the message interface
+ */
+ void setTransportMessage(EtchTransportMessage* transportMessage);
+
+ /**
+ * sets the resources
+ */
+ void setResources(EtchResources* resources);
+
+ /**
+ * sets the value factory
+ */
+ void setValueFactory(EtchValueFactory* valuefactory);
+
+ /**
+ * sets the mailbox manager
+ */
+ void setMailboxManager(EtchMailboxManager* mailboxmanager);
+
+ /**
+ * sets the delivery service
+ */
+ void setDeliveryService(EtchDeliveryService* deliveryservice);
+
+ /**
+ * sets the stub implemenation
+ */
+ void setStub(EtchSessionMessage* stub);
+
+ /**
+ * returns the transport interface
+ */
+ EtchTransportData* getTransportData();
+
+ /**
+ * returns the packet interface
+ */
+ EtchTransportPacket* getTransportPacket();
+
+ /**
+ * returns the message interface
+ */
+ EtchTransportMessage* getTransportMessage();
+
+ /**
+ * returns the resources
+ */
+ EtchResources* getResources();
+
+ /**
+ * returns the value factory
+ */
+ EtchValueFactory* getValueFactory();
+
+ /**
+ * returns the mailbox manager
+ */
+ EtchMailboxManager* getMailboxManager();
+
+ /**
+ * returns the delivery service
+ */
+ EtchDeliveryService* getDeliveryService();
+
+ /**
+ * returns the stub implemenatation
+ */
+ EtchSessionMessage* getStub();
+
+private:
+ EtchTransportData* mTransportData;
+ EtchTransportPacket* mTransportPacket;
+ EtchTransportMessage* mTransportMessage;
+ EtchResources* mResources;
+ EtchValueFactory* mValueFactory;
+ EtchMailboxManager* mMailboxManager;
+ EtchDeliveryService* mDeliveryService;
+ EtchSessionMessage* mStub;
+
};
#endif /* ETCHSTACK_H */
Copied: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h (from r1376587, incubator/etch/trunk/binding-cpp/runtime/include/support/EtchClientStack.h)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h?p2=incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h&p1=incubator/etch/trunk/binding-cpp/runtime/include/support/EtchClientStack.h&r1=1376587&r2=1376588&rev=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchClientStack.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h Thu Aug 23 16:48:16 2012
@@ -15,36 +15,37 @@
* limitations under the License.
*/
-
-#ifndef __ETCHCLIENTSTACK_H__
-#define __ETCHCLIENTSTACK_H__
+#ifndef __ETCHSTACKCLIENT_H__
+#define __ETCHSTACKCLIENT_H__
#include "support/EtchStack.h"
-#include "support/EtchRemoteBase.h"
-#include "transport/EtchSessionMessage.h"
-#include "support/EtchTransportHelper.h"
-
-// TODO: Refactoring of stack lifecycle ETCH-240
+#include "util/EtchResources.h"
-//Entry for EtchRuntime
-class EtchClientStack : public EtchStack {
+/* *
+ * This class serves as a container for all layers created during the setup of a new stack (connection, packetizer, messagizer, ...).
+ */
+class EtchStackClient : public EtchStack {
public:
/**
- * Constructs the EtchClientStack.
+ * EtchObjectType for EtchStackClient.
*/
- EtchClientStack(EtchRemoteBase* rb, EtchSessionMessage *helper, EtchResources *res, EtchValueFactory* vf);
+ static const EtchObjectType* TYPE();
/**
- * Destructor
+ * Default Constructor
*/
- virtual ~EtchClientStack();
+ EtchStackClient();
+
+ /**
+ * Destructor which cleans the whole stack
+ */
+ virtual ~EtchStackClient();
+
+public:
+ EtchResources* mStaticResources;
+
-private:
- EtchValueFactory *mVf;
- EtchRemoteBase *mRemoteBase;
- EtchSessionMessage *mStubHelper;
- EtchResources *mResources;
};
-#endif /* ETCHCLIENTSTACK_H */
+#endif /* __ETCHSTACKCLIENT_H__ */
Propchange: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackClient.h
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h (from r1376587, incubator/etch/trunk/binding-cpp/runtime/include/support/EtchServerStack.h)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h?p2=incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h&p1=incubator/etch/trunk/binding-cpp/runtime/include/support/EtchServerStack.h&r1=1376587&r2=1376588&rev=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchServerStack.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h Thu Aug 23 16:48:16 2012
@@ -15,35 +15,48 @@
* limitations under the License.
*/
-#ifndef __ETCHSERVERSTACK_H__
-#define __ETCHSERVERSTACK_H__
+#ifndef __ETCHSTACKSERVER_H__
+#define __ETCHSTACKSERVER_H__
-#include "support/EtchStack.h"
#include "support/EtchRemoteBase.h"
-#include "transport/EtchSessionMessage.h"
-#include "support/EtchTransportHelper.h"
-// TODO: Refactoring of stack lifecycle ETCH-240
-
-//Entry for EtchRuntime
-class EtchServerStack : public EtchStack {
+/* *
+ * This class serves as a container for all layers created during the setup of a new stack (connection, packetizer, messagizer, ...).
+ */
+class EtchStackServer : public EtchStack{
public:
/**
- * Constructs the EtchClientStack.
+ * EtchObjectType for EtchStackServer.
+ */
+ static const EtchObjectType* TYPE();
+
+ /**
+ * Default Constructor
*/
- EtchServerStack(EtchRemoteBase* rb, EtchSessionMessage *helper, EtchResources *res, EtchValueFactory* vf);
+ EtchStackServer();
/**
- * Destructor
+ * Destructor which cleans the whole stack
*/
- virtual ~EtchServerStack();
+ virtual ~EtchStackServer();
+
+
+ /**
+ * sets the remote implementation
+ */
+ void setRemote(EtchRemoteBase* remote);
+
+ /**
+ * returns the remote implementation
+ */
+ EtchRemoteBase* getRemote();
private:
- EtchValueFactory *mVf;
- EtchRemoteBase *mRemoteBase;
- EtchSessionMessage *mStubHelper;
- EtchResources *mResources;
+ EtchRemoteBase* mRemote;
+
+
+
};
-#endif /* ETCHSERVERSTACK_H */
+#endif /* __ETCHSTACKSERVER_H__ */
Propchange: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStackServer.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchStubBase.h Thu Aug 23 16:48:16 2012
@@ -34,7 +34,7 @@
template<typename T>
class EtchStubBase : public EtchSessionMessage {
public:
- template <typename Class>
+ template <typename U>
friend class EtchStubPoolRunnable;
/**
@@ -84,7 +84,7 @@ protected:
T* mObj;
};
-template<typename T>
+template<typename U>
class EtchStubPoolRunnable : public EtchPoolRunnable {
public:
@@ -97,7 +97,7 @@ public:
* @param msg the message.
* @param helper the StubHelper which will dispatch the message.
*/
- EtchStubPoolRunnable(EtchStubBase<T>* stub, capu::SmartPointer<EtchWho> sender, capu::SmartPointer<EtchMessage> msg, EtchStubHelper<T>* helper)
+ EtchStubPoolRunnable(EtchStubBase<U>* stub, capu::SmartPointer<EtchWho> sender, capu::SmartPointer<EtchMessage> msg, EtchStubHelper<U>* helper)
: mStub(stub)
, mSender(sender)
, mMsg(msg)
@@ -118,10 +118,10 @@ public:
}
private:
- EtchStubBase<T>* mStub;
+ EtchStubBase<U>* mStub;
capu::SmartPointer<EtchWho> mSender;
capu::SmartPointer<EtchMessage> mMsg;
- EtchStubHelper<T>* mHelper;
+ EtchStubHelper<U>* mHelper;
};
template<typename T>
@@ -133,7 +133,6 @@ EtchStubBase<T>::EtchStubBase(EtchDelive
template<typename T>
EtchStubBase<T>::~EtchStubBase() {
delete mObj;
- delete mSvc;
}
template<typename T>
@@ -190,4 +189,4 @@ status_t EtchStubBase<T>::sessionQuery(c
return ETCH_EUNIMPL;
}
-#endif
+#endif /* __ETCHSTUBBASE_H__ */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchConnection.h Thu Aug 23 16:48:16 2012
@@ -168,7 +168,7 @@ status_t EtchConnection<S>::fireUp() {
if (mSession != NULL) {
//TODO: run this in seperate thread
- mMutex.unlock();
+ mMutex.unlock();
return mSession->sessionNotify(new EtchString(EtchSession::UP()));
}
mMutex.unlock();
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpListener.h Thu Aug 23 16:48:16 2012
@@ -103,13 +103,6 @@ protected:
*/
virtual status_t readSocket();
-private:
- EtchRuntime* mRuntime;
- EtchServerSocket* mSocket;
- capu::uint16_t mPort;
- capu::uint8_t mBackLog;
-
-
public:
/**
* Query term for URI to specify backlog value to ServerSocket. The value
@@ -122,6 +115,40 @@ public:
* @see #TcpListener(String, Resources)
*/
const static EtchString& BACKLOG();
+
+ const static EtchString& CONNECTION_CHECK();
+
+private:
+ class ConnectionChecker : public capu::Runnable {
+ public:
+ /**
+ * Constructor
+ * @param instance of TcpListener
+ */
+ ConnectionChecker(EtchTcpListener* listener);
+
+ /**
+ * Destructor
+ */
+ virtual ~ConnectionChecker();
+
+ /**
+ * @see Runnable
+ */
+ void run();
+ private:
+ EtchTcpListener *mListener;
+ };
+
+ friend class ConnectionChecker;
+
+ EtchRuntime* mRuntime;
+ EtchServerSocket* mSocket;
+ capu::uint16_t mPort;
+ capu::uint8_t mBackLog;
+ capu::Thread* mConnectionCheckerThread;
+ ConnectionChecker* mConnectionChecker;
+
};
#endif /* ETCHTCPLISTENER_H */
Modified: incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h Thu Aug 23 16:48:16 2012
@@ -23,6 +23,7 @@
#include "common/EtchString.h"
#include "common/EtchConfig.h"
#include "support/EtchServerFactory.h"
+#include "support/EtchStack.h"
#include "transport/EtchTransportMessage.h"
#include "transport/EtchTransportData.h"
#include "transport/EtchTcpConnection.h"
@@ -38,6 +39,7 @@ class EtchTcpTransportFactory
: public EtchTransportFactory {
public:
+ friend class MySessionListener;
/**
* Constructor
* @param runtime
@@ -81,7 +83,7 @@ private:
* @param uri
* @param resources
*/
- MySessionListener(EtchRuntime* runtime, EtchTransport<EtchSessionListener<EtchSocket> > *transport,
+ MySessionListener(EtchRuntime* runtime, EtchTcpTransportFactory* factory, EtchTransport<EtchSessionListener<EtchSocket> > *transport,
EtchString uri, EtchResources* resources, capu::bool_t secure);
/**
@@ -141,6 +143,8 @@ private:
EtchServerFactory* mSession;
EtchRuntime* mRuntime;
capu::bool_t mIsSecure;
+ capu::List<EtchStack*>* mConnectionStacks;
+ EtchTcpTransportFactory* mFactory;
};
Modified: incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/Windows/ServerSocket.inc
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/Windows/ServerSocket.inc?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/Windows/ServerSocket.inc (original)
+++ incubator/etch/trunk/binding-cpp/runtime/lib/capu/modules/capu/include/capu/os/arch/Windows/ServerSocket.inc Thu Aug 23 16:48:16 2012
@@ -60,7 +60,11 @@ inline ServerSocket::~ServerSocket()
inline Socket* ServerSocket::accept()
{
- Socket *clientSocket = new Socket(::accept(mServerSocket, NULL, NULL));
+ SOCKET handle = ::accept(mServerSocket, NULL, NULL);
+ if (handle == INVALID_SOCKET) {
+ return NULL;
+ }
+ Socket *clientSocket = new Socket(handle);
return clientSocket;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/CMakeLists.txt Thu Aug 23 16:48:16 2012
@@ -58,7 +58,7 @@ SET(MAIN_INCLUDES
${PROJECT_SOURCE_DIR}/include/transport/EtchTransportData.h
${PROJECT_SOURCE_DIR}/include/transport/EtchTransportMessage.h
${PROJECT_SOURCE_DIR}/include/transport/EtchTransportPacket.h
- ${PROJECT_SOURCE_DIR}/include/transport/EtchTransportFactory.h
+ ${PROJECT_SOURCE_DIR}/include/transport/EtchTransportFactory.h
${PROJECT_SOURCE_DIR}/include/transport/EtchMessagizer.h
${PROJECT_SOURCE_DIR}/include/transport/EtchFormat.h
${PROJECT_SOURCE_DIR}/include/transport/EtchTcpTransportFactory.h
@@ -127,7 +127,7 @@ SET(MAIN_INCLUDES
${PROJECT_SOURCE_DIR}/include/support/EtchPoolRunnable.h
${PROJECT_SOURCE_DIR}/include/support/EtchFreePool.h
${PROJECT_SOURCE_DIR}/include/support/EtchQueuedPool.h
- ${PROJECT_SOURCE_DIR}/include/support/EtchRemoteBase.h
+ ${PROJECT_SOURCE_DIR}/include/support/EtchRemoteBase.h
${PROJECT_SOURCE_DIR}/include/support/EtchServerFactory.h
${PROJECT_SOURCE_DIR}/include/support/EtchStubHelper.h
${PROJECT_SOURCE_DIR}/include/support/EtchStubBase.h
@@ -135,9 +135,9 @@ SET(MAIN_INCLUDES
${PROJECT_SOURCE_DIR}/include/support/EtchPlainMailbox.h
${PROJECT_SOURCE_DIR}/include/support/EtchMonitor.h
${PROJECT_SOURCE_DIR}/include/support/EtchStack.h
+ ${PROJECT_SOURCE_DIR}/include/support/EtchStackClient.h
+ ${PROJECT_SOURCE_DIR}/include/support/EtchStackServer.h
${PROJECT_SOURCE_DIR}/include/support/EtchRuntime.h
- ${PROJECT_SOURCE_DIR}/include/support/EtchServerStack.h
- ${PROJECT_SOURCE_DIR}/include/support/EtchClientStack.h
${PROJECT_SOURCE_DIR}/include/util/EtchUtil.h
${PROJECT_SOURCE_DIR}/include/util/EtchCircularQueue.h
${PROJECT_SOURCE_DIR}/include/util/EtchIdGenerator.h
@@ -223,8 +223,9 @@ SET(MAIN_SOURCES
support/EtchTransportHelper.cpp
support/EtchMonitor.cpp
support/EtchRuntime.cpp
- support/EtchServerStack.cpp
- support/EtchClientStack.cpp
+ support/EtchStack.cpp
+ support/EtchStackClient.cpp
+ support/EtchStackServer.cpp
support/EtchAsyncResultNone.cpp
util/EtchCircularQueue.cpp
util/EtchUtil.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -71,21 +71,34 @@ status_t EtchAuthenticationExceptionSeri
EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
- EtchField field_ptr;
- result = type->getField(FIELD_NAME(), &field_ptr);
- if (result != ETCH_OK)
+
+ EtchField field;
+ result = type->getField(FIELD_NAME(), &field);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
+ result = class2type->put(EtchAuthenticationException::TYPE(), type);
+ if (result != ETCH_OK) {
return result;
- class2type->put(EtchAuthenticationException::TYPE(), type);
+ }
+
type->setComponentType(EtchAuthenticationException::TYPE());
+
//set the import export helper
- type->setImportExportHelper(new EtchAuthenticationExceptionSerializer(type, &field_ptr));
+ type->setImportExportHelper(new EtchAuthenticationExceptionSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> tmp;
result = EtchValidatorString::Get(0, tmp);
- if (result != ETCH_OK)
+ if (result != ETCH_OK) {
return result;
- result = type->putValidator(field_ptr, tmp);
- if (result != ETCH_OK)
+ }
+ result = type->putValidator(field, tmp);
+ if (result != ETCH_OK) {
return result;
+ }
+
type->lock();
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchAuthenticationExceptionSerializer has been initialized");
return ETCH_OK;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchClass2TypeMap.cpp Thu Aug 23 16:48:16 2012
@@ -39,9 +39,6 @@ status_t EtchClass2TypeMap::put(const Et
EtchType* tmp = NULL;
if (mC2T.get(classType, &tmp) == ETCH_OK) {
- if (!tmp->equals(type)) {
- return ETCH_ERANGE;
- }
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -72,22 +72,34 @@ status_t EtchDateSerializer::Init(EtchTy
EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
- EtchField field_ptr;
- result = type->getField(FIELD_NAME(), &field_ptr);
- if (result != ETCH_OK)
+
+ EtchField field;
+ result = type->getField(FIELD_NAME(), &field);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
+ result = class2type->put(EtchDate::TYPE(), type);
+ if (result != ETCH_OK) {
return result;
- class2type->put(EtchDate::TYPE(), type);
+ }
+
type->setComponentType(EtchDate::TYPE());
//set the import export helper
- type->setImportExportHelper(new EtchDateSerializer(type, &field_ptr));
+ type->setImportExportHelper(new EtchDateSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> val;
result = EtchValidatorLong::Get(0, val);
- if (result != ETCH_OK)
+ if (result != ETCH_OK) {
return result;
- result = type->putValidator(field_ptr, val);
- if (result != ETCH_OK)
+ }
+ result = type->putValidator(field, val);
+ if (result != ETCH_OK) {
return result;
+ }
+
type->lock();
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchDateSerializer has been initialized");
return ETCH_OK;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDefaultValueFactory.cpp Thu Aug 23 16:48:16 2012
@@ -131,36 +131,39 @@ EtchDefaultValueFactory::~EtchDefaultVal
delete mDynamicTypes;
}
-void EtchDefaultValueFactory::Init(EtchTypeMap* types, EtchClass2TypeMap* class2type) {
+status_t EtchDefaultValueFactory::Init(EtchTypeMap* types, EtchClass2TypeMap* class2type) {
+ status_t result;
EtchType *type;
- types->get(ETCH_RUNTIME_EXCEPTION_TYPE_NAME(), type);
- EtchRuntimeExceptionSerializer::Init(type, class2type);
+ result = types->get(ETCH_RUNTIME_EXCEPTION_TYPE_NAME(), type);
+ result = EtchRuntimeExceptionSerializer::Init(type, class2type);
- types->get(ETCH_LIST_TYPE_NAME(), type);
- EtchListSerializer::Init(type, class2type);
+ result = types->get(ETCH_LIST_TYPE_NAME(), type);
+ result = EtchListSerializer::Init(type, class2type);
- types->get(ETCH_MAP_TYPE_NAME(), type);
- EtchHashTableSerializer::Init(type, class2type);
+ result = types->get(ETCH_MAP_TYPE_NAME(), type);
+ result = EtchHashTableSerializer::Init(type, class2type);
- types->get(ETCH_SET_TYPE_NAME(), type);
- EtchSetSerializer::Init(type, class2type);
+ result = types->get(ETCH_SET_TYPE_NAME(), type);
+ result = EtchSetSerializer::Init(type, class2type);
- types->get(ETCH_DATETIME_TYPE_NAME(), type);
- EtchDateSerializer::Init(type, class2type);
+ result = types->get(ETCH_DATETIME_TYPE_NAME(), type);
+ result = EtchDateSerializer::Init(type, class2type);
- types->get(ETCH_AUTH_EXCEPTION_TYPE_NAME(), type);
- EtchAuthenticationExceptionSerializer::Init(type, class2type);
+ result = types->get(ETCH_AUTH_EXCEPTION_TYPE_NAME(), type);
+ result = EtchAuthenticationExceptionSerializer::Init(type, class2type);
{
- types->get(ETCH_EXCEPTION_MESSAGE_NAME(), type);
+ result = types->get(ETCH_EXCEPTION_MESSAGE_NAME(), type);
capu::SmartPointer<EtchValidator> val;
EtchValidatorRuntimeException::Get(val);
- type->putValidator(_mf_result(), val);
+ result = type->putValidator(_mf_result(), val);
EtchValidatorLong::Get(0, val);
- type->putValidator(_mf__messageId(), val);
- type->putValidator(_mf__inReplyTo(), val);
+ result = type->putValidator(_mf__messageId(), val);
+ result = type->putValidator(_mf__inReplyTo(), val);
}
+
+ return ETCH_OK;
}
const EtchType * EtchDefaultValueFactory::get_mt__Etch_RuntimeException() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -103,21 +103,34 @@ status_t EtchHashTableSerializer::Init(E
EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
- EtchField field_ptr;
- result = type->getField(FIELD_NAME(), &field_ptr);
- if (result != ETCH_OK)
+
+ EtchField field;
+ result = type->getField(FIELD_NAME(), &field);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
+ result = class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ if (result != ETCH_OK) {
return result;
- class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ }
+
type->setComponentType(EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >::TYPE());
+
//set the import export helper
- type->setImportExportHelper(new EtchHashTableSerializer(type, &field_ptr));
+ type->setImportExportHelper(new EtchHashTableSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> tmp;
result = EtchValidatorObject::Get(1, tmp);
- if (result != ETCH_OK)
+ if (result != ETCH_OK) {
return result;
- result = type->putValidator(field_ptr, tmp);
- if (result != ETCH_OK)
+ }
+ result = type->putValidator(field, tmp);
+ if (result != ETCH_OK) {
return result;
+ }
+
type->lock();
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchHashTableSerializer has been initialized");
return ETCH_OK;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -104,11 +104,18 @@ status_t EtchListSerializer::Init(EtchTy
return result;
}
- class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ result = class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
type->setComponentType(EtchList<capu::SmartPointer<EtchObject> >::TYPE());
+
//set the import export helper
// TODO memory EtchField
type->setImportExportHelper(new EtchListSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> validator;
result = EtchValidatorObject::Get(1, validator);
if (result != ETCH_OK) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -76,21 +76,35 @@ status_t EtchRuntimeExceptionSerializer:
EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
- EtchField field_ptr;
- result = type->getField(FIELD_NAME(), &field_ptr);
- if (result != ETCH_OK)
+
+ EtchField field;
+ result = type->getField(FIELD_NAME(), &field);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
+ result = class2type->put(EtchRuntimeException::TYPE(), type);
+ if (result != ETCH_OK) {
return result;
- class2type->put(EtchRuntimeException::TYPE(), type);
+ }
+
type->setComponentType(EtchRuntimeException::TYPE());
+
//set the import export helper
- type->setImportExportHelper(new EtchRuntimeExceptionSerializer(type, &field_ptr));
+ type->setImportExportHelper(new EtchRuntimeExceptionSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> tmp;
result = EtchValidatorString::Get(0, tmp);
- if (result != ETCH_OK)
+ if (result != ETCH_OK) {
return result;
- result = type->putValidator(field_ptr, tmp);
- if (result != ETCH_OK)
+ }
+ result = type->putValidator(field, tmp);
+ if (result != ETCH_OK) {
return result;
+ }
+
+ //lock type
type->lock();
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchRuntimeExceptionSerializer has been initialized");
return ETCH_OK;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp Thu Aug 23 16:48:16 2012
@@ -94,21 +94,34 @@ status_t EtchSetSerializer::Init(EtchTyp
EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
- EtchField field_ptr;
- result = type->getField(FIELD_NAME(), &field_ptr);
- if (result != ETCH_OK)
+
+ EtchField field;
+ result = type->getField(FIELD_NAME(), &field);
+ if (result != ETCH_OK) {
+ return result;
+ }
+
+ result = class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ if (result != ETCH_OK) {
return result;
- class2type->put(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), type);
+ }
+
type->setComponentType(EtchHashSet<capu::SmartPointer<EtchObject> >::TYPE());
+
//set the import export helper
- type->setImportExportHelper(new EtchSetSerializer(type, &field_ptr));
+ type->setImportExportHelper(new EtchSetSerializer(type, &field));
+
+ //get validator
capu::SmartPointer<EtchValidator> tmp;
result = EtchValidatorObject::Get(1, tmp);
- if (result != ETCH_OK)
+ if (result != ETCH_OK) {
return result;
- result = type->putValidator(field_ptr, tmp);
- if (result != ETCH_OK)
+ }
+ result = type->putValidator(field, tmp);
+ if (result != ETCH_OK) {
return result;
+ }
+
type->lock();
CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchSetSerializer has been initialized");
return ETCH_OK;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeMap.cpp Thu Aug 23 16:48:16 2012
@@ -24,6 +24,14 @@ EtchTypeMap::EtchTypeMap()
}
EtchTypeMap::~EtchTypeMap() {
+ EtchHashTable<capu::int32_t, EtchType*, capu::Hash, capu::Comparator >::Iterator it = mById.begin();
+ while (it.hasNext()) {
+ capu::Pair<capu::int32_t, EtchType*> pair;
+ it.next(&pair);
+ delete pair.second;
+ }
+ mById.clear();
+ mByName.clear();
}
status_t EtchTypeMap::add(EtchType *type) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp Thu Aug 23 16:48:16 2012
@@ -20,16 +20,22 @@
#include "transport/EtchTransportData.h"
#include "support/EtchRuntime.h"
#include "util/EtchLogger.h"
+#include "support/EtchStackClient.h"
static char* TAG = "EtchRemoteBase";
-EtchRemoteBase::EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf)
- : mSvc(svc), mVf(vf) {
+EtchRemoteBase::EtchRemoteBase(EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack)
+ : mSvc(svc), mVf(vf), mStack(stack) {
//TODO refactor this
mRuntime = EtchRuntime::getRuntime();
}
EtchRemoteBase::~EtchRemoteBase() {
+ if (mStack != NULL) {
+ if (mStack->isInstanceOf(EtchStackClient::TYPE())) {
+ delete mStack;
+ }
+ }
}
status_t EtchRemoteBase::newMessage( EtchType* type, capu::SmartPointer<EtchMessage> *message) {
Added: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp?rev=1376588&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp (added)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp Thu Aug 23 16:48:16 2012
@@ -0,0 +1,134 @@
+/* $Id$
+ * 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 "support/EtchStack.h"
+#include "support/EtchTransportHelper.h"
+
+const EtchObjectType* EtchStack::TYPE() {
+ const static EtchObjectType TYPE(EOTID_STACK, NULL);
+ return &TYPE;
+}
+
+const EtchString& EtchStack::STACK() {
+ static const EtchString cmd("STACK");
+ return cmd;
+}
+
+EtchStack::EtchStack() : EtchObject()
+ , mTransportData(NULL)
+ , mTransportPacket(NULL)
+ , mTransportMessage(NULL)
+ , mResources(NULL)
+ , mMailboxManager(NULL)
+ , mDeliveryService(NULL)
+ , mStub(NULL)
+ {
+ EtchObject::addObjectType(EtchStack::TYPE());
+}
+
+EtchStack::~EtchStack() {
+ if (mTransportMessage != NULL) {
+ delete mTransportMessage;
+ }
+ if (mTransportPacket != NULL) {
+ delete mTransportPacket;
+ }
+ if (mTransportData != NULL) {
+ delete mTransportData;
+ }
+ if (mResources != NULL) {
+ delete mResources;
+ }
+ if (mValueFactory != NULL) {
+ delete mValueFactory;
+ }
+ if (mMailboxManager != NULL) {
+ delete mMailboxManager;
+ }
+ if (mDeliveryService != NULL) {
+ delete mDeliveryService;
+ }
+
+ if (mStub != NULL) {
+ delete mStub;
+ }
+}
+
+void EtchStack::setTransportData(EtchTransportData* transportData) {
+ mTransportData = transportData;
+}
+
+void EtchStack::setTransportPacket(EtchTransportPacket* transportPacket) {
+ mTransportPacket = transportPacket;
+}
+
+void EtchStack::setTransportMessage(EtchTransportMessage* transportMessage) {
+ mTransportMessage = transportMessage;
+}
+
+void EtchStack::setResources(EtchResources* resources) {
+ mResources = resources;
+}
+
+void EtchStack::setValueFactory(EtchValueFactory* valuefactory) {
+ mValueFactory = valuefactory;
+}
+
+void EtchStack::setMailboxManager(EtchMailboxManager* mailboxmanager) {
+ mMailboxManager = mailboxmanager;
+}
+
+void EtchStack::setDeliveryService(EtchDeliveryService* deliveryservice) {
+ mDeliveryService = deliveryservice;
+}
+
+void EtchStack::setStub(EtchSessionMessage* stub) {
+ mStub = stub;
+}
+
+EtchTransportData* EtchStack::getTransportData() {
+ return mTransportData;
+}
+
+EtchTransportPacket* EtchStack::getTransportPacket() {
+ return mTransportPacket;
+}
+
+EtchTransportMessage* EtchStack::getTransportMessage() {
+ return mTransportMessage;
+}
+
+EtchResources* EtchStack::getResources() {
+ return mResources;
+}
+
+EtchValueFactory* EtchStack::getValueFactory() {
+ return mValueFactory;
+}
+
+EtchMailboxManager* EtchStack::getMailboxManager() {
+ return mMailboxManager;
+}
+
+EtchDeliveryService* EtchStack::getDeliveryService() {
+ return mDeliveryService;
+}
+
+EtchSessionMessage* EtchStack::getStub() {
+ return mStub;
+}
+
Propchange: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp (from r1376587, incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchClientStack.cpp)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp?p2=incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp&p1=incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchClientStack.cpp&r1=1376587&r2=1376588&rev=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchClientStack.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp Thu Aug 23 16:48:16 2012
@@ -15,22 +15,22 @@
* limitations under the License.
*/
-#include "support/EtchClientStack.h"
+#include "support/EtchStackClient.h"
+#include "support/EtchTransportHelper.h"
-EtchClientStack::EtchClientStack(EtchRemoteBase* rb, EtchSessionMessage *helper, EtchResources *res, EtchValueFactory* vf)
-: mRemoteBase(rb), mStubHelper(helper),mResources(res), mVf(vf) {
+const EtchObjectType* EtchStackClient::TYPE() {
+ const static EtchObjectType TYPE(EOTID_STACK_CLIENT, NULL);
+ return &TYPE;
}
-EtchClientStack::~EtchClientStack() {
- status_t status;
- status = EtchTransportHelper::DestroyResources(mResources);
- if(status != ETCH_OK) {
- // Log error
- }
- if(mStubHelper != NULL) {
- delete mStubHelper;
- }
- if(mVf != NULL) {
- delete mVf;
+EtchStackClient::EtchStackClient() : EtchStack(), mStaticResources(NULL) {
+ EtchObject::addObjectType(EtchStackClient::TYPE());
+ EtchObject::setObjectType(EtchStackClient::TYPE());
+}
+
+EtchStackClient::~EtchStackClient() {
+ if (mStaticResources != NULL) {
+ EtchTransportHelper::DestroyResources(mStaticResources);
}
}
+
Propchange: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp (from r1376587, incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchServerStack.cpp)
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp?p2=incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp&p1=incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchServerStack.cpp&r1=1376587&r2=1376588&rev=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchServerStack.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp Thu Aug 23 16:48:16 2012
@@ -15,15 +15,31 @@
* limitations under the License.
*/
-#include "support/EtchServerStack.h"
+#include "support/EtchStackServer.h"
-EtchServerStack::EtchServerStack(EtchRemoteBase* rb, EtchSessionMessage *helper, EtchResources *res, EtchValueFactory* vf)
-: mRemoteBase(rb), mStubHelper(helper),mResources(res), mVf(vf) {
+const EtchObjectType* EtchStackServer::TYPE() {
+ const static EtchObjectType TYPE(EOTID_STACK_SERVER, NULL);
+ return &TYPE;
}
-EtchServerStack::~EtchServerStack() {
- delete mResources;
- delete mRemoteBase;
- delete mStubHelper;
- delete mVf;
+EtchStackServer::EtchStackServer()
+: EtchStack()
+ , mRemote(NULL)
+{
+ EtchObject::addObjectType(EtchStackServer::TYPE());
+ EtchObject::setObjectType(EtchStackServer::TYPE());
+}
+
+EtchStackServer::~EtchStackServer() {
+ if (mRemote != NULL) {
+ delete mRemote;
+ }
+}
+
+void EtchStackServer::setRemote(EtchRemoteBase* remote) {
+ mRemote = remote;
+}
+
+EtchRemoteBase* EtchStackServer::getRemote() {
+ return mRemote;
}
Propchange: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp Thu Aug 23 16:48:16 2012
@@ -67,9 +67,7 @@ void EtchDefaultDeliveryService::init(Et
}
EtchDefaultDeliveryService::~EtchDefaultDeliveryService() {
- if(mTransport != NULL) {
- delete mTransport;
- }
+
}
const EtchMailboxManager* EtchDefaultDeliveryService::getTransport() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp Thu Aug 23 16:48:16 2012
@@ -51,8 +51,6 @@ EtchMessagizer::EtchMessagizer(EtchTrans
}
EtchMessagizer::~EtchMessagizer() {
- if(mTransport != NULL)
- delete mTransport;
if (mTdi != NULL)
delete mTdi;
if (mTdo != NULL)
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp Thu Aug 23 16:48:16 2012
@@ -85,8 +85,7 @@ EtchPacketizer::EtchPacketizer(EtchTrans
}
EtchPacketizer::~EtchPacketizer() {
- if (mTransport != NULL)
- delete mTransport;
+
}
capu::int32_t EtchPacketizer::getHeaderSize() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp Thu Aug 23 16:48:16 2012
@@ -36,7 +36,6 @@ EtchPlainMailboxManager::~EtchPlainMailb
p.second->closeDelivery();
delete p.second;
}
- delete mTransport;
}
EtchTransportMessage* EtchPlainMailboxManager::getTransport() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp Thu Aug 23 16:48:16 2012
@@ -122,7 +122,9 @@ status_t EtchTcpConnection::openSocket(c
}
}
// try to open a socket.
- mSocket = new EtchSocket();
+ if (mSocket == NULL) {
+ mSocket = new EtchSocket();
+ }
if (mSocket->connect((unsigned char *) mHost.c_str(), mPort) == ETCH_OK) {
mMutexConnection.unlock();
CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Connection established", mHost.c_str(), mPort);
@@ -131,6 +133,7 @@ status_t EtchTcpConnection::openSocket(c
mSocket->close();
delete mSocket;
mSocket = NULL;
+ first = false;
}
CAPU_LOG_WARN(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Connection could not be established for stack %d", mHost.c_str(), mPort);
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp?rev=1376588&r1=1376587&r2=1376588&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp Thu Aug 23 16:48:16 2012
@@ -21,11 +21,33 @@
+EtchTcpListener::ConnectionChecker::ConnectionChecker(EtchTcpListener* listener) : mListener(listener){ }
+
+EtchTcpListener::ConnectionChecker::~ConnectionChecker() {}
+
+void EtchTcpListener::ConnectionChecker::run() {
+ status_t result;
+ while (mListener->mIsStarted) {
+ if (mListener->mSession != NULL) {
+ result = mListener->mSession->sessionNotify(new EtchString(EtchTcpListener::CONNECTION_CHECK()));
+ if (result != ETCH_OK) {
+ //TODO handle error
+ }
+ capu::Thread::Sleep(1000);
+ }
+ }
+}
+
const EtchString& EtchTcpListener::BACKLOG() {
static const EtchString name("TcpTransportFactory.socket");
return name;
}
+const EtchString& EtchTcpListener::CONNECTION_CHECK() {
+ static const EtchString name("connection.check");
+ return name;
+}
+
EtchTcpListener::EtchTcpListener(EtchURL *url)
: mPort(url->getPort()) {
//TODO rafactor this
@@ -45,6 +67,8 @@ EtchTcpListener::EtchTcpListener(EtchURL
mIsStarted = false;
mThread = NULL;
mSocket = NULL;
+ mConnectionCheckerThread = NULL;
+ mConnectionChecker = NULL;
}
EtchTcpListener::~EtchTcpListener() {
@@ -52,12 +76,18 @@ EtchTcpListener::~EtchTcpListener() {
mThread->join();
delete mThread;
}
+ if (mConnectionCheckerThread != NULL) {
+ mConnectionCheckerThread->join();
+ delete mConnectionCheckerThread;
+ }
if (mSocket != NULL) {
mSocket->close();
delete mSocket;
mSocket = NULL;
}
+ delete mConnectionChecker;
+
}
capu::bool_t EtchTcpListener::isStarted() {
@@ -65,8 +95,9 @@ capu::bool_t EtchTcpListener::isStarted(
}
status_t EtchTcpListener::close() {
- if (mSocket != NULL)
+ if (mSocket != NULL) {
return mSocket->close();
+ }
return ETCH_ERROR;
}
@@ -74,18 +105,19 @@ status_t EtchTcpListener::openSocket(cap
// if a one time connection from a server socket listener, just
// return the existing socket.
mMutexConnection.lock();
- if (!reconnect && (mSocket != NULL)) {
+ if (reconnect && (mSocket != NULL)) {
mMutexConnection.unlock();
return ETCH_OK;
}
- while (isStarted()) {
+ while (mIsStarted) {
// if reconnect is false and first is true, this is our
// very first attempt to connect. otherwise, we are trying
// to reconnect a broken link or establish a link where we
// have already failed at least once.
// try to open a socket.
-
- mSocket = new EtchServerSocket();
+ if (mSocket == NULL) {
+ mSocket = new EtchServerSocket();
+ }
if (mSocket->bind(mPort) == ETCH_OK) {
if (mSocket->listen(mBackLog) == ETCH_OK) {
mMutexConnection.unlock();
@@ -97,7 +129,6 @@ status_t EtchTcpListener::openSocket(cap
CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpListener", "Listening on specified port has failed");
}
} else {
- mSocket->close();
delete mSocket;
mSocket = NULL;
CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpListener", "Binding to specified port has failed");
@@ -110,7 +141,7 @@ status_t EtchTcpListener::openSocket(cap
status_t EtchTcpListener::readSocket() {
EtchSocket* s = NULL;
- while (isStarted()) {
+ while (mIsStarted) {
s = mSocket->accept();
if (s == NULL)
break;
@@ -136,8 +167,11 @@ status_t EtchTcpListener::transportContr
mIsStarted = true;
mMutex.unlock();
mThread = new capu::Thread(this);
+ mConnectionChecker = new ConnectionChecker(this);
+ mConnectionCheckerThread = new capu::Thread(mConnectionChecker);
mThread->start();
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Start command received and EtchTcpListener starts listening on port %d", mPort);
+ mConnectionCheckerThread->start();
return ETCH_OK;
}
@@ -150,8 +184,11 @@ status_t EtchTcpListener::transportContr
mIsStarted = true;
mMutex.unlock();
mThread = new capu::Thread(this);
+ mConnectionChecker = new ConnectionChecker(this);
+ mConnectionCheckerThread = new capu::Thread(mConnectionChecker);
mThread->start();
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Start and wait up command received and EtchTcpListener starts listening on port %d", mPort);
+ mConnectionCheckerThread->start();
return waitUp(((EtchInt32*) value.get())->get());
}
@@ -175,10 +212,9 @@ status_t EtchTcpListener::transportContr
mMutex.lock();
mIsStarted = false;
mMutex.unlock();
- status_t ret = waitDown(((EtchInt32*) value.get())->get());
close();
CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Stop and wait command received and EtchTcpListener sets the stop flag");
- //TODO: Wait handling in one of the next releases
+ status_t ret = waitDown(((EtchInt32*) value.get())->get());
return ret;
}
@@ -223,7 +259,7 @@ void EtchTcpListener::run() {
while (mIsStarted) {
- if (openSocket(!first) != ETCH_OK) {
+ if (openSocket(first) != ETCH_OK) {
CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpListener", "Socket has not been created");
break;
}
Author: fitzner
Date: Thu Aug 23 16:46:37 2012
New Revision: 1376587
URL: http://svn.apache.org/viewvc?rev=1376587&view=rev
Log:
ETCH-198 Changed remote compiler template
Implemented initial client answers
Change-Id: I2bc036e131e9b5e90ffd1a204b14f9b49c0cafc2
Added:
incubator/etch/trunk/examples/helloworld/java/.classpath
incubator/etch/trunk/examples/helloworld/java/.project
Modified:
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h
incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp
incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPlainMailbox.cpp
incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp
incubator/etch/trunk/examples/helloworld/cpp/src/main/include/MainHelloWorldClient.h
incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_cpp.vm
Thu Aug 23 16:46:37 2012
@@ -35,8 +35,9 @@ using namespace $namespace;
#foreach($n in $intf.iterator())
#if($n.isMsgDir($mc))
#if(!$n.isHidden())
-$clname::$n.name()AsyncResultRemote::$n.name()AsyncResultRemote(EtchRuntime* runtime, EtchMailbox*
mailbox)
- : #if($n.hasReturn())EtchAsyncResult<$helper.getEtchTypeName($n.type(), false)>(runtime,
mailbox)#{else}EtchAsyncResultNone(runtime, mailbox)#end {
+$clname::$n.name()AsyncResultRemote::$n.name()AsyncResultRemote($clname* base, EtchMailbox*
mailbox)
+ : #if($n.hasReturn())EtchAsyncResult<$helper.getEtchTypeName($n.type(), false)>(base->mRuntime,
mailbox)#{else}EtchAsyncResultNone(base->mRuntime, mailbox)#end {
+ mBase = base;
}
$clname::$n.name()AsyncResultRemote::~$n.name()AsyncResultRemote() {
@@ -44,7 +45,28 @@ $clname::$n.name()AsyncResultRemote::~$n
status_t $clname::$n.name()AsyncResultRemote::mailboxStatus(EtchMailbox* mb, EtchObject*
state, capu::bool_t closed) {
- //TODO implemented callback
+#if(!$n.isOneway())
+ status_t status;
+
+ if(!closed) {
+ capu::SmartPointer<EtchObject> result;
+ status = mBase->endcall(mb, $vfname::$n.getResultMessage().vname($helper), result);
+ if(status != ETCH_OK) {
+ // TODO set result to a runtime exception
+ return ETCH_OK;
+ }
+ if(result->isInstanceOf(EtchException::TYPE())) {
+ setException(result);
+ }
+#if($n.hasReturn())
+ else {
+ setResult(result);
+ }
+#end
+
+ }
+
+#end
return ETCH_OK;
}
@@ -70,7 +92,7 @@ $intfname::$n.name()AsyncResultPtr $clna
// TODO log error
}
- $n.name()AsyncResultRemote* result = new $n.name()AsyncResultRemote(base->mRuntime,
mb);
+ $n.name()AsyncResultRemote* result = new $n.name()AsyncResultRemote(base, mb);
return result;
}
@@ -103,13 +125,10 @@ $clname::~$clname() {
#if(!$methodList.contains($n.name().name()))
#set ( $addMethodListStatus = $methodList.add($n.name().name()))
-#if(!$n.isMsgDirBoth())
-#if($n.isOneway())
+#if($hasBaseClass && $n.isMsgDirBoth())
$intfname::$n.name()AsyncResultPtr $clname::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator()
)$sep$helper.getEtchTypeName( $p.type(), true ) $p.name() #set( $sep = ", " )#end) {
- $n.name()AsyncResultPtr result = $clname::$n.name()AsyncResultRemote::Begin(this, #set($sep
= "")#foreach($p in $n.iterator())$p.name() #set( $sep = ", ")#end);
- return result;
+ return Remote$i::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator() )$sep$p.name()
#set( $sep = ", " )#end);
}
-
#else
$intfname::$n.name()AsyncResultPtr $clname::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator()
)$sep$helper.getEtchTypeName( $p.type(), true ) $p.name() #set( $sep = ", " )#end) {
$n.name()AsyncResultPtr result = $clname::$n.name()AsyncResultRemote::Begin(this, #set($sep
= "")#foreach($p in $n.iterator())$p.name() #set( $sep = ", ")#end);
@@ -117,12 +136,6 @@ $intfname::$n.name()AsyncResultPtr $clna
}
#end
-#else
-$intfname::$n.name()AsyncResultPtr $clname::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator()
)$sep$helper.getEtchTypeName( $p.type(), true ) $p.name() #set( $sep = ", " )#end) {
- return Remote$i::$n.name()(#set( $sep = "" )#foreach( $p in $n.iterator() )$sep$p.name()
#set( $sep = ", " )#end);
-}
-#end
-
#end
#end
#end
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/remote_h.vm
Thu Aug 23 16:46:37 2012
@@ -64,7 +64,7 @@ namespace $namespace {
/**
* Create a new instance from $clname class
*/
- $n.name()AsyncResultRemote(EtchRuntime* runtime, EtchMailbox* mailbox);
+ $n.name()AsyncResultRemote($clname* base, EtchMailbox* mailbox);
/**
* Destructor
@@ -80,6 +80,9 @@ namespace $namespace {
* Create a new instance from $clname class
*/
static $n.name()AsyncResultPtr Begin($clname* base, #set($sep = "")#foreach($p in
$n.iterator())$sep$helper.getEtchTypeName($p.type(), true) $p.name()#set($sep = ", ")#end);
+
+ private:
+ $clname* mBase;
};
#end
Modified: incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
(original)
+++ incubator/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
Thu Aug 23 16:46:37 2012
@@ -80,9 +80,7 @@ public:
// create result message
#if($mthd.hasReturn())
if(ar->hasResult()) {
- capu::SmartPointer<$helper.getEtchTypeName($mthd.type(), false)> result;
- ar->getResult(result);
- _rmsg->put(ValueFactory$i::_mf_result(), result);
+ _rmsg->put(ValueFactory$i::_mf_result(), ar->getResult());
} else
#end
if(ar->hasException()) {
Modified: incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/common/EtchObject.h Thu Aug 23 16:46:37
2012
@@ -20,7 +20,7 @@
#define __ETCHOBJECT_H__
#include "capu/util/SmartPointer.h"
-#include "capu/container/List.h"
+#include "capu/container/List.h"
#include "EtchError.h"
class EtchObjectType;
@@ -49,17 +49,16 @@ public:
virtual ~EtchObject();
/**
- * Returns object type id of this type.
- */
+ */
virtual const EtchObjectType* getObjectType() const;
- /**
- * Returns true if the type hierarchy of this instance
- * is from the given type.
- * @param type to check
- * @return true if the instance is compatible to the given type
- */
- virtual capu::bool_t isInstanceOf(const EtchObjectType* type) const;
+ /**
+ * Returns true if the type hierarchy of this instance
+ * is from the given type.
+ * @param type to check
+ * @return true if the instance is compatible to the given type
+ */
+ virtual capu::bool_t isInstanceOf(const EtchObjectType* type) const;
/**
* Returns hash code
@@ -72,19 +71,19 @@ public:
*/
virtual capu::bool_t equals(const EtchObject * other) const;
- protected:
- /**
- * Adds the object type to the type hierachy of this instance.
- * @param type that should be added to type hierachy of this instance.
- */
- virtual status_t addObjectType(const EtchObjectType* type);
-
- // TODO remove me if object hierachy was refactored
- virtual status_t setObjectType(const EtchObjectType* type);
-
- private:
- const EtchObjectType* mType;
- capu::List<const EtchObjectType*> mTypes;
+protected:
+ /**
+ * Adds the object type to the type hierachy of this instance.
+ * @param type that should be added to type hierachy of this instance.
+ */
+ virtual status_t addObjectType(const EtchObjectType* type);
+
+ // TODO remove me if object hierachy was refactored
+ virtual status_t setObjectType(const EtchObjectType* type);
+
+private:
+ const EtchObjectType* mType;
+ capu::List<const EtchObjectType*> mTypes;
};
typedef capu::SmartPointer<EtchObject> EtchObjectPtr;
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResult.h Thu Aug 23
16:46:37 2012
@@ -75,15 +75,14 @@ public:
/**
* Returns the result
*/
- status_t getResult(capu::SmartPointer<T> &result) {
+ capu::SmartPointer<T> getResult() {
if(hasException()) {
- return ETCH_ERROR;
- }
+ return NULL;
+ } else
if(hasResult()) {
- result = mResult;
- return ETCH_OK;
+ return mResult;
}
- return ETCH_OK;
+ return NULL;
}
private:
Modified: incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/support/EtchAsyncResultNone.h Thu Aug
23 16:46:37 2012
@@ -62,7 +62,7 @@ public:
/**
* @see EtchNotify
*/
- virtual status_t mailboxStatus(EtchMailbox* mb, EtchObject* state, capu::bool_t closed);
+ virtual status_t mailboxStatus(EtchMailbox* mb, EtchObject* state, capu::bool_t closed)
{return ETCH_OK;};
protected:
EtchRuntime* mRuntime;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp Thu Aug 23
16:46:37 2012
@@ -23,13 +23,17 @@ const EtchObjectType* EtchException::TYP
}
EtchException::EtchException()
-: EtchObject(EtchException::TYPE()), mErrorMessage(""), mErrorcode(0), mExcptype(0) {
-
+: EtchObject(), mErrorMessage(""), mErrorcode(0), mExcptype(0) {
+ EtchObject::addObjectType(EtchException::TYPE());
+ // TODO change object hierachy
+ EtchObject::setObjectType(EtchException::TYPE());
}
EtchException::EtchException(EtchString msg, status_t errcode, EtchExceptionType type)
-: EtchObject(EtchException::TYPE()), mErrorMessage(msg), mErrorcode(errcode), mExcptype(type)
{
-
+: EtchObject(), mErrorMessage(msg), mErrorcode(errcode), mExcptype(type) {
+ EtchObject::addObjectType(EtchException::TYPE());
+ // TODO change object hierachy
+ EtchObject::setObjectType(EtchException::TYPE());
}
EtchException::EtchException(EtchString msg, status_t errcode, EtchExceptionType type, const
EtchObjectType* type_id)
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchAsyncResultNone.cpp Thu
Aug 23 16:46:37 2012
@@ -38,8 +38,6 @@ EtchAsyncResultNone::~EtchAsyncResultNon
capu::bool_t EtchAsyncResultNone::hasException() {
mMutex.lock();
while(!mHasMailboxStatus) {
- // TODO wait
- break;
mCond.wait(&mMutex);
}
mMutex.unlock();
@@ -61,17 +59,3 @@ void EtchAsyncResultNone::setException(c
mCond.signal();
mMutex.unlock();
}
-
-status_t EtchAsyncResultNone::mailboxStatus(EtchMailbox* mb, EtchObject* state, capu::bool_t
closed) {
-
- // TODO get data or exception from mailbox
- // TODO call onResult( EtchObject* state);
- // TODO call onEception( EtchObject* state);
- // TODO setException(NULL);
- // TODO call delegate
- mMutex.lock();
- mHasMailboxStatus = true;
- mCond.signal();
- mMutex.unlock();
- return ETCH_OK;
-}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPlainMailbox.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPlainMailbox.cpp?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPlainMailbox.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPlainMailbox.cpp Thu Aug
23 16:46:37 2012
@@ -66,12 +66,12 @@ void EtchPlainMailbox::fireNotify() {
n = mNotify;
s = mState;
c = mQueue.isClosed();
+
+ mMutex.unlock();
if (n != NULL) {
n->mailboxStatus(this, s, c);
}
- // TODO: check if the unlock must be so late
- mMutex.unlock();
}
status_t EtchPlainMailbox::read(EtchMailbox::EtchElement*& result) {
@@ -120,11 +120,60 @@ status_t EtchPlainMailbox::closeRead() {
}
status_t EtchPlainMailbox::registerNotify(EtchMailbox::EtchNotify* notify, EtchObject* state,
capu::int32_t maxDelay) {
- return ETCH_EUNIMPL;
+ if(notify == NULL) {
+ return ETCH_EINVAL;
+ }
+
+ if(maxDelay < 0) {
+ return ETCH_EINVAL;
+ }
+
+ capu::bool_t isNotEmptyOrIsClosed;
+
+ mMutex.lock();
+
+ if(mNotify != NULL) {
+ mMutex.unlock();
+ return ETCH_EINVAL;
+ }
+
+ mNotify = notify;
+ mState = state;
+
+ isNotEmptyOrIsClosed = !mQueue.isEmpty() || mQueue.isClosed();
+
+ mMutex.unlock();
+
+ if(isNotEmptyOrIsClosed) {
+ fireNotify();
+ }
+
+ return ETCH_OK;
}
status_t EtchPlainMailbox::unregisterNotify(EtchMailbox::EtchNotify* notify) {
- return ETCH_EUNIMPL;
+
+ if(mNotify == NULL) {
+ return ETCH_EINVAL;
+ }
+
+ if(notify == NULL) {
+ return ETCH_OK;
+ }
+
+ mMutex.lock();
+
+ if(mNotify != notify) {
+ mMutex.unlock();
+ return ETCH_EINVAL;
+ }
+
+ mNotify = NULL;
+ mState = NULL;
+
+ mMutex.unlock();
+
+ return ETCH_OK;
}
capu::bool_t EtchPlainMailbox::isEmpty() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp Thu Aug 23
16:46:37 2012
@@ -19,9 +19,61 @@
#include <gtest/gtest.h>
#include "common/EtchString.h"
+class EtchObjectMy1Object : public EtchObject {
+public:
+
+ /**
+ * EtchObjectType for EtchObjectMyObject.
+ */
+ static const EtchObjectType* TYPE() {
+ const static EtchObjectType TYPE(11, NULL);
+ return &TYPE;
+ }
+
+ /**
+ * Constructor
+ */
+ EtchObjectMy1Object()
+ : EtchObject() {
+ EtchObject::addObjectType(TYPE());
+ }
+
+};
+
+class EtchObjectMy2Object : public EtchObject {
+public:
+
+ /**
+ * EtchObjectType for EtchObjectMyObject.
+ */
+ static const EtchObjectType* TYPE() {
+ const static EtchObjectType TYPE(12, NULL);
+ return &TYPE;
+ }
+
+ /**
+ * Constructor
+ */
+ EtchObjectMy2Object()
+ : EtchObject() {
+ EtchObject::addObjectType(TYPE());
+ }
+
+};
+
+
TEST(EtchObjectTest, getTypeTrait) {
EXPECT_EQ(EtchObjectType::VALUE, EtchObjectType::getTypeTrait<EtchString>());
EXPECT_EQ(EtchObjectType::POINTER, EtchObjectType::getTypeTrait<EtchString*>());
EXPECT_EQ(EtchObjectType::SMART_POINTER, EtchObjectType::getTypeTrait<capu::SmartPointer<EtchString>
>());
}
+
+TEST(EtchObjectTest, isInstanceOf) {
+ EtchObjectMy1Object* o1 = new EtchObjectMy1Object();
+ EXPECT_EQ(true, o1->isInstanceOf(EtchObjectMy1Object::TYPE()));
+ EXPECT_EQ(true, o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_EQ(false, o1->isInstanceOf(EtchObjectMy2Object::TYPE()));
+
+ delete o1;
+}
\ No newline at end of file
Modified: incubator/etch/trunk/examples/helloworld/cpp/src/main/include/MainHelloWorldClient.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/src/main/include/MainHelloWorldClient.h?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/src/main/include/MainHelloWorldClient.h (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/src/main/include/MainHelloWorldClient.h Thu
Aug 23 16:46:37 2012
@@ -19,11 +19,11 @@ namespace org_apache_etch_examples_hello
* Main program for HelloWorldClient. This program makes a connection to the
* listener created by MainHelloWorldListener.
*/
- class MainHelloWorldClient
+ class MainHelloWorldClientFactory
: public HelloWorldHelper::HelloWorldClientFactory
{
public:
- virtual ~MainHelloWorldClient() {}
+ virtual ~MainHelloWorldClientFactory() {}
HelloWorldClient* newHelloWorldClient(RemoteHelloWorldServer* server);
};
}
Modified: incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp?rev=1376587&r1=1376586&r2=1376587&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp (original)
+++ incubator/etch/trunk/examples/helloworld/cpp/src/main/src/MainHelloWorldClient.cpp Thu
Aug 23 16:46:37 2012
@@ -16,7 +16,7 @@
using namespace org_apache_etch_examples_helloworld_HelloWorld;
-HelloWorldClient* MainHelloWorldClient::newHelloWorldClient(RemoteHelloWorldServer* server)
+HelloWorldClient* MainHelloWorldClientFactory::newHelloWorldClient(RemoteHelloWorldServer*
server)
{
return new ImplHelloWorldClient(server);
}
@@ -35,16 +35,15 @@ capu::int32_t main(int argc, const char*
// TODO Change to correct URI
EtchString uri("tcp://127.0.0.1:4001");
- MainHelloWorldClient mc;
- status_t result;
+ MainHelloWorldClientFactory mc;
+ status_t result;
RemoteHelloWorldServer *remote = NULL;
result = HelloWorldHelper::newServer(runtime, uri, NULL, mc, remote);
if (result != ETCH_OK) {
//TODO Handle error
}
-
// Connect to the service
result = remote->transportControl(new EtchString(EtchTransportData::START_AND_WAIT_UP()),
new EtchInt32(4000));
if (result != ETCH_OK) {
@@ -52,8 +51,16 @@ capu::int32_t main(int argc, const char*
}
HelloWorld::userPtr myUser = new HelloWorld::user(new EtchInt32(1),new EtchString("World"));
- remote->say_hello(myUser);
-
+ HelloWorldServer::say_helloAsyncResultPtr say_helloResult = remote->say_hello(myUser);
+ if(say_helloResult->hasException()) {
+ capu::SmartPointer<EtchException> exception = say_helloResult->getException();
+ printf("say_hello FAILED: exception=%s \n", exception->getErrorMessage().c_str());
+ }
+ if(say_helloResult->hasResult()) {
+ capu::SmartPointer<EtchString> result = say_helloResult->getResult();
+ printf("say_hello OK: result=%s\n", result->c_str());
+ }
+
// Disconnect from the service
remote->transportControl(new EtchString(EtchTransportData::STOP_AND_WAIT_DOWN()), new
EtchInt32(4000));
Added: incubator/etch/trunk/examples/helloworld/java/.classpath
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/java/.classpath?rev=1376587&view=auto
==============================================================================
--- incubator/etch/trunk/examples/helloworld/java/.classpath (added)
+++ incubator/etch/trunk/examples/helloworld/java/.classpath Thu Aug 23 16:46:37 2012
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="target/generated-sources/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="ETCH_HOME/binding-java/lib/apache-etch-java-runtime-1.3.0-incubating.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: incubator/etch/trunk/examples/helloworld/java/.project
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/java/.project?rev=1376587&view=auto
==============================================================================
--- incubator/etch/trunk/examples/helloworld/java/.project (added)
+++ incubator/etch/trunk/examples/helloworld/java/.project Thu Aug 23 16:46:37 2012
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.apache.etch.binding-java.examples.helloworld</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Author: fitzner
Date: Thu Aug 23 16:45:28 2012
New Revision: 1376586
URL: http://svn.apache.org/viewvc?rev=1376586&view=rev
Log:
ETCH-243 EtchRuntimeTest Warning Fix
- warning fix EQ(false, foo())
- Assert to Expect
Change-Id: I5163338cc51b404427118ed3f709a3f9948ed19d
Modified:
incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp?rev=1376586&r1=1376585&r2=1376586&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp Thu Aug
23 16:45:28 2012
@@ -32,9 +32,9 @@ TEST(EtchRuntime, getId) {
TEST(EtchRuntime, isClosed) {
EtchRuntime* runtime = new EtchRuntime();
- ASSERT_EQ(false, runtime->isClosed());
+ EXPECT_FALSE(runtime->isClosed());
runtime->shutdown();
- ASSERT_EQ(true, runtime->isClosed());
+ EXPECT_TRUE(runtime->isClosed());
delete runtime;
}
@@ -43,7 +43,7 @@ public:
/**
* Constructor
*/
- EtchRuntimeTestListener()
+ EtchRuntimeTestListener()
: mId(0) {
}
@@ -61,22 +61,22 @@ public:
TEST(EtchRuntime, registerListener) {
status_t status;
EtchRuntime* runtime = new EtchRuntime();
-
+
status = runtime->registerListener(NULL);
- ASSERT_EQ(ETCH_EINVAL, status);
+ EXPECT_EQ(ETCH_EINVAL, status);
EtchRuntimeTestListener listener;
status = runtime->registerListener(&listener);
- ASSERT_EQ(ETCH_OK, status);
+ EXPECT_EQ(ETCH_OK, status);
// a shutdown leads to a runtime change
runtime->shutdown();
status = runtime->unregisterListener(&listener);
- ASSERT_EQ(ETCH_OK, status);
+ EXPECT_EQ(ETCH_OK, status);
// check if callback was fired
- ASSERT_EQ(1, listener.mId);
+ EXPECT_EQ(1, listener.mId);
delete runtime;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp Thu Aug 23 16:42:45 2012
@@ -18,7 +18,9 @@
#include "serialization/EtchHashTableSerializer.h"
+#include "support/EtchRuntime.h"
+static char* TAG = "EtchHashTableSerializer";
const EtchString& EtchHashTableSerializer::FIELD_NAME() {
static const EtchString name("keysAndValues");
@@ -27,11 +29,11 @@ const EtchString& EtchHashTableSerialize
EtchHashTableSerializer::EtchHashTableSerializer(EtchType* type, EtchField* field)
: mField(*field), mType(type) {
-
+ //TODO refactoring
+ mRuntime = EtchRuntime::getRuntime();
}
EtchHashTableSerializer::~EtchHashTableSerializer() {
-
}
status_t EtchHashTableSerializer::exportValue(EtchValueFactory* vf, capu::SmartPointer<EtchObject> value, EtchStructValue*& result) {
@@ -42,10 +44,10 @@ status_t EtchHashTableSerializer::export
capu::SmartPointer<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > table = capu::smartpointer_cast<EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> > > (value);
- EtchHashTable<capu::SmartPointer<EtchObject> , capu::SmartPointer<EtchObject> >::Iterator it = table->begin();
+ EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >::Iterator it = table->begin();
capu::SmartPointer<EtchNativeArray<capu::SmartPointer<EtchObject> > > keysAndValuesArray = new EtchNativeArray<capu::SmartPointer<EtchObject> > (table->count()*2);
capu::int32_t i = 0;
- EtchHashTable<capu::SmartPointer<EtchObject> , capu::SmartPointer<EtchObject> >::Pair ptr;
+ EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >::Pair ptr;
while (it.hasNext()) {
it.next(&ptr);
@@ -59,7 +61,7 @@ status_t EtchHashTableSerializer::export
if (result->put(mField, keysAndValuesArray) != ETCH_OK) {
return ETCH_ERROR;
}
-
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "HashTable has been serialized");
return ETCH_OK;
}
@@ -70,10 +72,12 @@ status_t EtchHashTableSerializer::import
return ETCH_EINVAL;
}
capu::SmartPointer<EtchObject> tmp;
- if (value->get(mField, &tmp) != ETCH_OK)
+ if (value->get(mField, &tmp) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "KeysAndValues Field could not be found");
return ETCH_ERROR;
+ }
- EtchHashTable<capu::SmartPointer<EtchObject> , capu::SmartPointer<EtchObject> >* table = new EtchHashTable<capu::SmartPointer<EtchObject> , capu::SmartPointer<EtchObject> >();
+ EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >* table = new EtchHashTable<capu::SmartPointer<EtchObject>, capu::SmartPointer<EtchObject> >();
capu::SmartPointer<EtchNativeArray<capu::SmartPointer<EtchObject> > > keysAndValuesArray = capu::smartpointer_cast<EtchNativeArray<capu::SmartPointer<EtchObject> > > (tmp);
@@ -90,10 +94,14 @@ status_t EtchHashTableSerializer::import
return res;
}
result = (EtchObject*) table;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "HashTable has been deserialized");
return ETCH_OK;
}
status_t EtchHashTableSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
+ //TODO rafactor this
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
+
status_t result;
EtchField field_ptr;
result = type->getField(FIELD_NAME(), &field_ptr);
@@ -111,5 +119,6 @@ status_t EtchHashTableSerializer::Init(E
if (result != ETCH_OK)
return result;
type->lock();
+ CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchHashTableSerializer has been initialized");
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp Thu Aug 23 16:42:45 2012
@@ -17,6 +17,9 @@
*/
#include "serialization/EtchListSerializer.h"
+#include "support/EtchRuntime.h"
+
+static char* TAG = "EtchListSerializer";
const EtchString& EtchListSerializer::FIELD_NAME() {
static const EtchString name("values");
@@ -27,6 +30,8 @@ const EtchString& EtchListSerializer::FI
EtchListSerializer::EtchListSerializer(EtchType* type, EtchField* field)
: mField(*field), mType(type) {
+ //TODO refactor this
+ mRuntime = EtchRuntime::getRuntime();
}
EtchListSerializer::~EtchListSerializer() {
@@ -53,6 +58,7 @@ status_t EtchListSerializer::exportValue
result = new EtchStructValue(mType, vf);
if (result->put(mField, values) != ETCH_OK)
return ETCH_ERROR;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "List has been serialized");
return ETCH_OK;
}
@@ -65,8 +71,10 @@ status_t EtchListSerializer::importValue
}
capu::SmartPointer<EtchObject> tmp = NULL;
- if (value->get(mField, &tmp) != ETCH_OK)
+ if (value->get(mField, &tmp) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Values Field could not be found");
return ETCH_ERROR;
+ }
capu::SmartPointer<EtchNativeArray<capu::SmartPointer<EtchObject> > > values = capu::smartpointer_cast<EtchNativeArray<capu::SmartPointer<EtchObject> > >(tmp);
@@ -80,10 +88,14 @@ status_t EtchListSerializer::importValue
return res;
}
result = (EtchObject*) list;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "List has been deserialized");
return ETCH_OK;
}
status_t EtchListSerializer::Init(EtchType* type, EtchClass2TypeMap * class2type) {
+ //TODO rafactor this
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
+
status_t result;
EtchField field;
@@ -108,5 +120,6 @@ status_t EtchListSerializer::Init(EtchTy
}
type->lock();
+ CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchListSerializer has been initialized");
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp Thu Aug 23 16:42:45 2012
@@ -17,6 +17,9 @@
*/
#include "serialization/EtchRuntimeExceptionSerializer.h"
+#include "support/EtchRuntime.h"
+
+static char* TAG = "EtchRuntimeExceptionSerializer";
const EtchString& EtchRuntimeExceptionSerializer::FIELD_NAME() {
static const EtchString name("msg");
@@ -24,9 +27,11 @@ const EtchString& EtchRuntimeExceptionSe
}
// TODO: check signature regarding by value copy
+
EtchRuntimeExceptionSerializer::EtchRuntimeExceptionSerializer(EtchType* type, EtchField* field)
: mField(*field), mType(type) {
-
+ //TODO refactor this
+ mRuntime = EtchRuntime::getRuntime();
}
EtchRuntimeExceptionSerializer::~EtchRuntimeExceptionSerializer() {
@@ -41,11 +46,14 @@ status_t EtchRuntimeExceptionSerializer:
}
capu::SmartPointer<EtchObject> tmp;
- if (value->get(mField, &tmp) != ETCH_OK)
+ if (value->get(mField, &tmp) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Msg Field could not be found");
return ETCH_ERROR;
+ }
EtchString str = *((EtchString*) tmp.get());
result = new EtchRuntimeException(str, ETCH_ERROR);
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been deserialized");
return ETCH_OK;
}
@@ -59,11 +67,13 @@ status_t EtchRuntimeExceptionSerializer:
if (result->put(mField, str) != ETCH_OK)
return ETCH_ERROR;
-
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been serialized");
return ETCH_OK;
}
status_t EtchRuntimeExceptionSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
+ //TODO rafactor this
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
status_t result;
EtchField field_ptr;
@@ -82,5 +92,6 @@ status_t EtchRuntimeExceptionSerializer:
if (result != ETCH_OK)
return result;
type->lock();
+ CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchRuntimeExceptionSerializer has been initialized");
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp Thu Aug 23 16:42:45 2012
@@ -17,6 +17,9 @@
*/
#include "serialization/EtchSetSerializer.h"
+#include "support/EtchRuntime.h"
+
+static const char* TAG = "EtchSetSerializer";
const EtchString& EtchSetSerializer::FIELD_NAME() {
static const EtchString name("keys");
@@ -25,11 +28,11 @@ const EtchString& EtchSetSerializer::FIE
EtchSetSerializer::EtchSetSerializer(EtchType* type, EtchField* field)
: mField(*field), mType(type) {
-
+ // TODO refactoring
+ mRuntime = EtchRuntime::getRuntime();
}
EtchSetSerializer::~EtchSetSerializer() {
-
}
status_t EtchSetSerializer::exportValue(EtchValueFactory* vf, capu::SmartPointer<EtchObject> value, EtchStructValue*& result) {
@@ -54,7 +57,7 @@ status_t EtchSetSerializer::exportValue(
result = new EtchStructValue(mType, vf);
if (result->put(mField, array) != ETCH_OK)
return ETCH_ERROR;
-
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Set has been serialized");
return ETCH_OK;
}
@@ -65,8 +68,10 @@ status_t EtchSetSerializer::importValue(
return ETCH_EINVAL;
}
capu::SmartPointer<EtchObject> tmp;
- if (value->get(mField, &tmp) != ETCH_OK)
+ if (value->get(mField, &tmp) != ETCH_OK) {
+ CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Keys Field could not be found");
return ETCH_ERROR;
+ }
EtchHashSet<capu::SmartPointer<EtchObject> >* set = new EtchHashSet<capu::SmartPointer<EtchObject> >();
@@ -80,10 +85,14 @@ status_t EtchSetSerializer::importValue(
return res;
}
result = (capu::SmartPointer<EtchObject>) set;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Set has been deserialized");
return ETCH_OK;
}
status_t EtchSetSerializer::Init(EtchType* type, EtchClass2TypeMap* class2type) {
+ //TODO refactoring
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
+
status_t result;
EtchField field_ptr;
result = type->getField(FIELD_NAME(), &field_ptr);
@@ -101,5 +110,6 @@ status_t EtchSetSerializer::Init(EtchTyp
if (result != ETCH_OK)
return result;
type->lock();
+ CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchSetSerializer has been initialized");
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Thu Aug 23 16:42:45 2012
@@ -17,11 +17,13 @@
*/
#include "serialization/EtchValidatorBoolean.h"
+#include "support/EtchRuntime.h"
-capu::SmartPointer<EtchValidator>* EtchValidatorBoolean::Validators()
-{
- static capu::SmartPointer<EtchValidator> ret[MAX_CACHED];
- return &(ret[0]);
+static const char* TAG = "EtchValidatorBoolean";
+
+capu::SmartPointer<EtchValidator>* EtchValidatorBoolean::Validators(EtchRuntime* runtime) {
+ static EtchValidatorCaches validators;
+ return validators.get(runtime);
}
const EtchObjectType* EtchValidatorBoolean::TYPE() {
@@ -31,7 +33,8 @@ const EtchObjectType* EtchValidatorBoole
EtchValidatorBoolean::EtchValidatorBoolean(capu::uint32_t ndim)
: EtchTypeValidator(EtchValidatorBoolean::TYPE(), EtchBool::TYPE(), EtchBool::TYPE(), ndim) {
-
+ //TODO rafactor this
+ mRuntime = EtchRuntime::getRuntime();
}
EtchValidatorBoolean::~EtchValidatorBoolean() {
@@ -63,14 +66,19 @@ capu::bool_t EtchValidatorBoolean::valid
status_t EtchValidatorBoolean::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
if (validate(value)) {
+ CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
result = value;
return ETCH_OK;
} else {
+ CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
return ETCH_ERROR;
}
}
status_t EtchValidatorBoolean::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
+ //TODO rafactor this
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
+
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
@@ -78,10 +86,11 @@ status_t EtchValidatorBoolean::Get(capu:
val = new EtchValidatorBoolean(ndim);
return ETCH_OK;
}
- if (Validators()[ndim].get() == NULL) {
- Validators()[ndim] = new EtchValidatorBoolean(ndim);
+ if (Validators(runtime)[ndim].get() == NULL) {
+ Validators(runtime)[ndim] = new EtchValidatorBoolean(ndim);
+ CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorBoolean has been created");
}
- val = Validators()[ndim];
+ val = Validators(runtime)[ndim];
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Thu Aug 23 16:42:45 2012
@@ -17,11 +17,13 @@
*/
#include "serialization/EtchValidatorByte.h"
+#include "support/EtchRuntime.h"
-capu::SmartPointer<EtchValidator>* EtchValidatorByte::Validators()
-{
- static capu::SmartPointer<EtchValidator> ret[MAX_CACHED];
- return &(ret[0]);
+static const char* TAG = "EtchValidatorByte";
+
+capu::SmartPointer<EtchValidator>* EtchValidatorByte::Validators(EtchRuntime* runtime) {
+ static EtchValidatorCaches validators;
+ return validators.get(runtime);
}
const EtchObjectType* EtchValidatorByte::TYPE() {
@@ -31,7 +33,8 @@ const EtchObjectType* EtchValidatorByte:
EtchValidatorByte::EtchValidatorByte(capu::uint32_t ndim)
: EtchTypeValidator(EtchValidatorByte::TYPE(), EtchByte::TYPE(), EtchByte::TYPE(), ndim) {
-
+ //TODO rafactor this
+ mRuntime = EtchRuntime::getRuntime();
}
EtchValidatorByte::~EtchValidatorByte() {
@@ -49,17 +52,17 @@ capu::bool_t EtchValidatorByte::validate
if (value->getObjectType()->equals(EtchShort::TYPE())) {
EtchShort *v = (EtchShort *) value.get();
- return ((v->get() >= capu::NumericLimitMin<capu::int8_t> ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t> ()));
+ return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
}
if (value->getObjectType()->equals(EtchInt32::TYPE())) {
EtchInt32 *v = (EtchInt32 *) value.get();
- return ((v->get() >= capu::NumericLimitMin<capu::int8_t> ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t> ()));
+ return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
}
if (value->getObjectType()->equals(EtchLong::TYPE())) {
EtchLong *v = (EtchLong *) value.get();
- return ((v->get() >= capu::NumericLimitMin<capu::int8_t> ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t> ()));
+ return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
}
//array handling
if ((value->getObjectType()->isArray()) && (mExpectedType->isArray())) {
@@ -81,33 +84,44 @@ status_t EtchValidatorByte::validateValu
if (validate(value)) {
if ((value->getObjectType()->equals(EtchByte::TYPE())) || (mNDims > 0)) {
result = value;
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "Object has been validated");
return ETCH_OK;
} else {
if (value->getObjectType()->equals(EtchShort::TYPE())) {
EtchShort *v = (EtchShort *) value.get();
result = new EtchByte((capu::int8_t)v->get());
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "Short has been validated by EtchValidatorByte and converted to EtchByte");
+
return ETCH_OK;
}
if (value->getObjectType()->equals(EtchLong::TYPE())) {
EtchLong *v = (EtchLong *) value.get();
result = new EtchByte((capu::int8_t)v->get());
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "EtchLong has been validated by EtchValidatorByte and converted to EtchByte");
+
return ETCH_OK;
}
if (value->getObjectType()->equals(EtchInt32::TYPE())) {
EtchInt32 *v = (EtchInt32 *) value.get();
result = new EtchByte((capu::int8_t)v->get());
+ CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "EtchInt32 has been validated by EtchValidatorByte and converted to EtchByte");
return ETCH_OK;
}
+ CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorByte", "Object has not been validated");
return ETCH_ERROR;
}
} else {
+ CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorByte", "Object has not been validated");
return ETCH_ERROR;
}
}
status_t EtchValidatorByte::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
+ //TODO rafactor this
+ EtchRuntime* runtime = EtchRuntime::getRuntime();
+
if (ndim > MAX_NDIMS) {
return ETCH_EINVAL;
}
@@ -115,10 +129,12 @@ status_t EtchValidatorByte::Get(capu::ui
val = new EtchValidatorByte(ndim);
return ETCH_OK;
}
- if (Validators()[ndim].get() == NULL) {
- Validators()[ndim] = new EtchValidatorByte(ndim);
+ if (Validators(runtime)[ndim].get() == NULL) {
+ Validators(runtime)[ndim] = new EtchValidatorByte(ndim);
+ CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorByte", "EtchValidatorByte has been created");
+
}
- val = Validators()[ndim];
+ val = Validators(runtime)[ndim];
return ETCH_OK;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1376584&r1=1376583&r2=1376584&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp Thu Aug 23 16:42:45 2012
@@ -18,6 +18,63 @@
#include "serialization/EtchValidatorCustom.h"
+/**
+ * Etch validator chaches for each runtime
+ */
+class EtchValidatorCustomCaches : public EtchRuntimeListener {
+public:
+ /**
+ * Validator cache
+ */
+ struct ValidatorCache {
+ capu::uint64_t id;
+ EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> > validators;
+ };
+
+ /**
+ * Construct a new instance from the Validators class.
+ */
+ EtchValidatorCustomCaches() {
+ }
+
+ /**
+ * Destructor
+ */
+ virtual ~EtchValidatorCustomCaches() {
+ capu::List<ValidatorCache*>::Iterator iter