You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2017/06/28 15:15:41 UTC
[01/10] geode-native git commit: Close socket before deleting it.
Repository: geode-native
Updated Branches:
refs/heads/feature/GEODE-3143 [created] 791bb113f
Close socket before deleting it.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/5554c8a3
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/5554c8a3
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/5554c8a3
Branch: refs/heads/feature/GEODE-3143
Commit: 5554c8a37cdcea874ba823e134f9b5bb586c3fba
Parents: 338428a
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 10:33:14 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 10:33:14 2017 +0300
----------------------------------------------------------------------
.gitignore | 17 +++++++++++++++++
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/5554c8a3/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9943eda..cc64c0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,20 @@
/.settings/
/.cproject
/.project
+/.vs
+/src/CMakeSettings.json
+/.vs/config/applicationhost.config
+/.vs/slnx.sqlite
+/.vs/ProjectSettings.json
+/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599/GEODE_BASE.ipch
+/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599
+/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f/FWKBBSERVER.ipch
+/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f
+/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220
+/.vs/geode-native2/v15/Browse.VC.opendb
+/.vs/geode-native2/v15/Browse.VC.db
+/.vs/geode-native2/v15/.suo
+/.vs/geode-native2/v15
+/.vs/config/applicationhost.config
+/.vs/config
+/.vs
http://git-wip-us.apache.org/repos/asf/geode-native/blob/5554c8a3/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 3c3747d..f3f38e9 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -263,7 +263,7 @@ void TcpConn::connect() {
"TcpConn::connect Attempt to connect timed out after %d seconds.",
waitSeconds);
// this is only called by constructor, so we must delete m_io
- GF_SAFE_DELETE(m_io);
+ close();
throw TimeoutException(msg);
}
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
[05/10] geode-native git commit: Close ACE_SOCK_Stream before
deleting it
Posted by ec...@apache.org.
Close ACE_SOCK_Stream before deleting it
GF_SAFE_DELETE will delete the ACE_SOCK_Stream object but the socket
will still be open.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9ca823f8
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9ca823f8
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9ca823f8
Branch: refs/heads/feature/GEODE-3143
Commit: 9ca823f889c53d5603d3e3ecf866a8fe085fc012
Parents: 0b31ccc
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:10:34 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:10:34 2017 +0300
----------------------------------------------------------------------
.gitignore | 8 ++++++++
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/9ca823f8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9943eda..593afa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,11 @@
/.settings/
/.cproject
/.project
+.vs/config/applicationhost.config
+src/CMakeSettings.json
+.vs/slnx.sqlite
+*.json
+.vs/geode-native2/v15/Browse.VC.opendb
+*.db
+.vs/geode-native2/v15/.suo
+.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
http://git-wip-us.apache.org/repos/asf/geode-native/blob/9ca823f8/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 3c3747d..b80aa51 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -269,7 +269,7 @@ void TcpConn::connect() {
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
- GF_SAFE_DELETE(m_io);
+ close();
throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
[06/10] geode-native git commit: Revert "Close ACE_SOCK_Stream before
deleting it"
Posted by ec...@apache.org.
Revert "Close ACE_SOCK_Stream before deleting it"
This reverts commit 9ca823f889c53d5603d3e3ecf866a8fe085fc012.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/4fe58136
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/4fe58136
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/4fe58136
Branch: refs/heads/feature/GEODE-3143
Commit: 4fe58136309737f2d3ca8a17b1c3e7c21a04a0a6
Parents: 9ca823f
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:11:58 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:11:58 2017 +0300
----------------------------------------------------------------------
.gitignore | 8 --------
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/4fe58136/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 593afa1..9943eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,3 @@
/.settings/
/.cproject
/.project
-.vs/config/applicationhost.config
-src/CMakeSettings.json
-.vs/slnx.sqlite
-*.json
-.vs/geode-native2/v15/Browse.VC.opendb
-*.db
-.vs/geode-native2/v15/.suo
-.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
http://git-wip-us.apache.org/repos/asf/geode-native/blob/4fe58136/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index b80aa51..3c3747d 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -269,7 +269,7 @@ void TcpConn::connect() {
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
- close();
+ GF_SAFE_DELETE(m_io);
throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
[03/10] geode-native git commit: Close ACE_SOCK_Stream before
deleting it
Posted by ec...@apache.org.
Close ACE_SOCK_Stream before deleting it
GF_SAFE_DELETE will delete the ACE_SOCK_Stream but the socket will still
be open.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/1896744d
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/1896744d
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/1896744d
Branch: refs/heads/feature/GEODE-3143
Commit: 1896744d6f6d0fa25ca62b8b9b060c28398e1f02
Parents: 25255eb
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:04:24 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:04:24 2017 +0300
----------------------------------------------------------------------
.../1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch | Bin 0 -> 327680 bytes
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1896744d/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
----------------------------------------------------------------------
diff --git a/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch b/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
new file mode 100644
index 0000000..8671421
Binary files /dev/null and b/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch differ
http://git-wip-us.apache.org/repos/asf/geode-native/blob/1896744d/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 3c3747d..b80aa51 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -269,7 +269,7 @@ void TcpConn::connect() {
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
- GF_SAFE_DELETE(m_io);
+ close();
throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
[07/10] geode-native git commit: Close socket before deleting it.
Posted by ec...@apache.org.
Close socket before deleting it.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/97c265ee
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/97c265ee
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/97c265ee
Branch: refs/heads/feature/GEODE-3143
Commit: 97c265eef15f17deb312cda051c20a62bbb4c30b
Parents: 4fe5813
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:13:53 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:13:53 2017 +0300
----------------------------------------------------------------------
src/cppcache/src/TcpConn.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/97c265ee/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 3c3747d..b80aa51 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -269,7 +269,7 @@ void TcpConn::connect() {
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
- GF_SAFE_DELETE(m_io);
+ close();
throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
[04/10] geode-native git commit: Revert "Close ACE_SOCK_Stream before
deleting it"
Posted by ec...@apache.org.
Revert "Close ACE_SOCK_Stream before deleting it"
This reverts commit 1896744d6f6d0fa25ca62b8b9b060c28398e1f02.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/0b31ccc1
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/0b31ccc1
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/0b31ccc1
Branch: refs/heads/feature/GEODE-3143
Commit: 0b31ccc12382ed4cd365c77f4dc89437abf3449b
Parents: 1896744
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:08:29 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:08:29 2017 +0300
----------------------------------------------------------------------
.../1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch | Bin 327680 -> 0 bytes
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/0b31ccc1/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
----------------------------------------------------------------------
diff --git a/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch b/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch
deleted file mode 100644
index 8671421..0000000
Binary files a/.vs/geode-native2/v15/ipch/AutoPCH/1f9ac4ce/GEODE_BASE-2ee16599/GEODE_BASE.ipch and /dev/null differ
http://git-wip-us.apache.org/repos/asf/geode-native/blob/0b31ccc1/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index b80aa51..3c3747d 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -269,7 +269,7 @@ void TcpConn::connect() {
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
- close();
+ GF_SAFE_DELETE(m_io);
throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
[08/10] geode-native git commit: Updates OpenSSL to 1.0.2l.
Posted by ec...@apache.org.
Updates OpenSSL to 1.0.2l.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/9065599d
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/9065599d
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/9065599d
Branch: refs/heads/feature/GEODE-3143
Commit: 9065599d0a599fc65f4051dc7f8f93a1d750040d
Parents: 97c265e
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Tue Jun 27 10:20:56 2017 -0700
Committer: Ernest Burghardt <eb...@pivotal.io>
Committed: Wed Jun 28 08:13:52 2017 -0700
----------------------------------------------------------------------
src/dependencies/openssl/CMakeLists.txt | 8 ++++----
src/dependencies/openssl/patches | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/9065599d/src/dependencies/openssl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/openssl/CMakeLists.txt b/src/dependencies/openssl/CMakeLists.txt
index 3ff8a6c..b95b344 100644
--- a/src/dependencies/openssl/CMakeLists.txt
+++ b/src/dependencies/openssl/CMakeLists.txt
@@ -12,12 +12,12 @@
# 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.
-cmake_minimum_required( VERSION 3.3 )
+
project( openssl C )
-set( ${PROJECT_NAME}_VERSION 1.0.1u )
-set( ${PROJECT_NAME}_SHA265 4312b4ca1215b6f2c97007503d80db80d5157f76f8f7d3febbe6b4c56ff26739 )
-set( ${PROJECT_NAME}_URL "https://www.openssl.org/source/old/1.0.1/openssl-${${PROJECT_NAME}_VERSION}.tar.gz" )
+set( ${PROJECT_NAME}_VERSION 1.0.2l )
+set( ${PROJECT_NAME}_SHA265 ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c )
+set( ${PROJECT_NAME}_URL "https://www.openssl.org/source/openssl-${${PROJECT_NAME}_VERSION}.tar.gz" )
set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
set ( ${PROJECT_NAME}_CFLAGS "${${PROJECT_NAME}_CFLAGS} ${CFLAGS_ARCH}" )
http://git-wip-us.apache.org/repos/asf/geode-native/blob/9065599d/src/dependencies/openssl/patches
----------------------------------------------------------------------
diff --git a/src/dependencies/openssl/patches b/src/dependencies/openssl/patches
index 192c69c..2e1a656 100644
--- a/src/dependencies/openssl/patches
+++ b/src/dependencies/openssl/patches
@@ -1,10 +1,10 @@
diff -ru a/Configure b/Configure
--- a/Configure 2015-12-03 06:48:58.000000000 -0800
+++ b/Configure 2015-12-17 04:11:33.900916627 -0800
-@@ -229,7 +229,7 @@
+@@ -255,7 +255,7 @@
#### Solaris x86 with Sun C setups
- "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-x86-cc","cc:-fast -xarch=generic -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+"solaris64-x86_64-cc","cc:-fast -m64 -xchip=generic -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-m64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
[09/10] geode-native git commit: GEODE-3142: Updates ACE to 6.4.3.
Posted by ec...@apache.org.
GEODE-3142: Updates ACE to 6.4.3.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/847344df
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/847344df
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/847344df
Branch: refs/heads/feature/GEODE-3143
Commit: 847344dfb84a85e647adb66ea9c0e245dfa1c9a6
Parents: 9065599
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Tue Jun 27 16:43:09 2017 -0700
Committer: Ernest Burghardt <eb...@pivotal.io>
Committed: Wed Jun 28 08:13:52 2017 -0700
----------------------------------------------------------------------
src/dependencies/ACE/CMakeLists.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/847344df/src/dependencies/ACE/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/ACE/CMakeLists.txt b/src/dependencies/ACE/CMakeLists.txt
index 9076d46..58f22aa 100644
--- a/src/dependencies/ACE/CMakeLists.txt
+++ b/src/dependencies/ACE/CMakeLists.txt
@@ -12,12 +12,13 @@
# 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.
-cmake_minimum_required( VERSION 3.3 )
+
project( ACE )
-set( ${PROJECT_NAME}_VERSION 6.4.1 )
-set( ${PROJECT_NAME}_SHA265 bc51ffcc6c68f9a244def11a92c6843e789349538b997529c7942629641379ce )
-set( ${PROJECT_NAME}_URL "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_4_1/ACE.tar.gz" )
+set( ${PROJECT_NAME}_VERSION 6.4.3 )
+set( ${PROJECT_NAME}_SHA265 164daf3e0cafa86a6a2b35a598eb42231bc6c71b55991fdaacbeade008ac5b8d )
+string(REPLACE "." "_" _VERSION_UNDERSCORE ${${PROJECT_NAME}_VERSION})
+set( ${PROJECT_NAME}_URL "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${_VERSION_UNDERSCORE}/ACE.tar.gz" )
set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
set( ${PROJECT_NAME}_DEPENDS openssl-extern )
[10/10] geode-native git commit: GEODE-3058: Removes Windows LFH
enablement.
Posted by ec...@apache.org.
GEODE-3058: Removes Windows LFH enablement.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/791bb113
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/791bb113
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/791bb113
Branch: refs/heads/feature/GEODE-3143
Commit: 791bb113f3739d46f6188426ec33fdf5dd490fc6
Parents: 847344d
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Wed Jun 28 00:37:08 2017 +0000
Committer: Ernest Burghardt <eb...@pivotal.io>
Committed: Wed Jun 28 08:13:52 2017 -0700
----------------------------------------------------------------------
src/cppcache/src/DistributedSystem.cpp | 53 -----------------------------
1 file changed, 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/791bb113/src/cppcache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DistributedSystem.cpp b/src/cppcache/src/DistributedSystem.cpp
index 965bfa5..72ae401 100644
--- a/src/cppcache/src/DistributedSystem.cpp
+++ b/src/cppcache/src/DistributedSystem.cpp
@@ -57,58 +57,6 @@ StatisticsManager* g_statMngr = nullptr;
SystemProperties* g_sysProps = nullptr;
} // namespace
-namespace apache {
-namespace geode {
-namespace client {
-void setLFH() {
-#ifdef _WIN32
- static HINSTANCE kernelMod = nullptr;
- if (kernelMod == nullptr) {
- kernelMod = GetModuleHandle("kernel32");
- if (kernelMod != nullptr) {
- typedef BOOL(WINAPI * PHSI)(
- HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass,
- PVOID HeapInformation, SIZE_T HeapInformationLength);
- typedef HANDLE(WINAPI * PGPH)();
- PHSI pHSI = nullptr;
- PGPH pGPH = nullptr;
- if ((pHSI = (PHSI)GetProcAddress(kernelMod, "HeapSetInformation")) !=
- nullptr) {
- // The LFH API is available
- /* Only set LFH for process heap; causes problems in C++ framework if
- set for all heaps
- HANDLE hProcessHeapHandles[1024];
- DWORD dwRet;
- ULONG heapFragValue = 2;
-
- dwRet= GetProcessHeaps( 1024, hProcessHeapHandles );
- for (DWORD i = 0; i < dwRet; i++)
- {
- HeapSetInformation( hProcessHeapHandles[i],
- HeapCompatibilityInformation, &heapFragValue, sizeof(heapFragValue)
- );
- }
- */
- HANDLE hProcessHeapHandle;
- ULONG heapFragValue = 2;
- if ((pGPH = (PGPH)GetProcAddress(kernelMod, "GetProcessHeap")) !=
- nullptr) {
- hProcessHeapHandle = pGPH();
- LOGCONFIG(
- "Setting Microsoft Windows' low-fragmentation heap for use as "
- "the main process heap.");
- pHSI(hProcessHeapHandle, HeapCompatibilityInformation, &heapFragValue,
- sizeof(heapFragValue));
- }
- }
- }
- }
-#endif
-}
-} // namespace client
-} // namespace geode
-} // namespace apache
-
DistributedSystem::DistributedSystem(const char* name) : m_name(nullptr) {
LOGDEBUG("DistributedSystem::DistributedSystem");
if (name != nullptr) {
@@ -125,7 +73,6 @@ DistributedSystem::~DistributedSystem() { GF_SAFE_DELETE_ARRAY(m_name); }
DistributedSystemPtr DistributedSystem::connect(
const char* name, const PropertiesPtr& configPtr) {
ACE_Guard<ACE_Recursive_Thread_Mutex> disconnectGuard(*g_disconnectLock);
- setLFH();
if (m_connected == true) {
throw AlreadyConnectedException(
"DistributedSystem::connect: already connected, call getInstance to "
[02/10] geode-native git commit: Revert "Close socket before deleting
it."
Posted by ec...@apache.org.
Revert "Close socket before deleting it."
This reverts commit 5554c8a37cdcea874ba823e134f9b5bb586c3fba.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/25255eb3
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/25255eb3
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/25255eb3
Branch: refs/heads/feature/GEODE-3143
Commit: 25255eb3ab8afc161f26dd35ed96bd46b1805505
Parents: 5554c8a
Author: fdaniel7 <fd...@amdocs.com>
Authored: Wed Jun 28 11:00:29 2017 +0300
Committer: fdaniel7 <fd...@amdocs.com>
Committed: Wed Jun 28 11:00:29 2017 +0300
----------------------------------------------------------------------
.gitignore | 17 -----------------
src/cppcache/src/TcpConn.cpp | 2 +-
2 files changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/25255eb3/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cc64c0a..9943eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,20 +4,3 @@
/.settings/
/.cproject
/.project
-/.vs
-/src/CMakeSettings.json
-/.vs/config/applicationhost.config
-/.vs/slnx.sqlite
-/.vs/ProjectSettings.json
-/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599/GEODE_BASE.ipch
-/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/GEODE_BASE-2ee16599
-/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f/FWKBBSERVER.ipch
-/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220/FWKBBSERVER-8b7fc38f
-/.vs/geode-native2/v15/ipch/AutoPCH/e98f8220
-/.vs/geode-native2/v15/Browse.VC.opendb
-/.vs/geode-native2/v15/Browse.VC.db
-/.vs/geode-native2/v15/.suo
-/.vs/geode-native2/v15
-/.vs/config/applicationhost.config
-/.vs/config
-/.vs
http://git-wip-us.apache.org/repos/asf/geode-native/blob/25255eb3/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index f3f38e9..3c3747d 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -263,7 +263,7 @@ void TcpConn::connect() {
"TcpConn::connect Attempt to connect timed out after %d seconds.",
waitSeconds);
// this is only called by constructor, so we must delete m_io
- close();
+ GF_SAFE_DELETE(m_io);
throw TimeoutException(msg);
}
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",