You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2017/11/23 08:56:32 UTC
[1/7] qpid-proton git commit: PROTON-1694: Proactor libuv
implementation doesn't initialise mutexes
Repository: qpid-proton
Updated Branches:
refs/heads/master 822d08deb -> d82bbfab0
PROTON-1694: Proactor libuv implementation doesn't initialise mutexes
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ef33dd67
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ef33dd67
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ef33dd67
Branch: refs/heads/master
Commit: ef33dd674c82c474ce0bffbf595ddb45c40e9297
Parents: 822d08d
Author: Roddie Kieley <rk...@unifiedsoftworx.com>
Authored: Sat Nov 11 19:51:20 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Nov 22 17:36:18 2017 -0500
----------------------------------------------------------------------
proton-c/src/proactor/libuv.c | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ef33dd67/proton-c/src/proactor/libuv.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/libuv.c b/proton-c/src/proactor/libuv.c
index 4088b07..0e5437d 100644
--- a/proton-c/src/proactor/libuv.c
+++ b/proton-c/src/proactor/libuv.c
@@ -305,6 +305,7 @@ static pconnection_t *pconnection(pn_proactor_t *p, pn_connection_t *c, bool ser
work_init(&pc->work, p, T_CONNECTION);
pc->next = pconnection_unqueued;
pc->write.data = &pc->work;
+ uv_mutex_init(&pc->lock);
if (server) {
pn_transport_set_server(pc->driver.transport);
}
@@ -660,6 +661,7 @@ void pn_listener_free(pn_listener_t *l) {
free(ls);
}
assert(!l->accept.front);
+ uv_mutex_destroy(&l->lock);
free(l);
}
}
@@ -1239,6 +1241,7 @@ pn_listener_t *pn_listener(void) {
pn_listener_free(l);
return NULL;
}
+ uv_mutex_init(&l->lock);
}
return l;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[7/7] qpid-proton git commit: PROTON-522: Apache Qpid Proton on
Mac/OSX
Posted by as...@apache.org.
PROTON-522: Apache Qpid Proton on Mac/OSX
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e9480cb3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e9480cb3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e9480cb3
Branch: refs/heads/master
Commit: e9480cb3cd46e3f1437a0b03462cdf2bcd52bb25
Parents: 6dddff2
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Nov 10 12:53:14 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e9480cb3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b1e7a5..48e1d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,9 +82,10 @@ if (CMAKE_BUILD_TYPE MATCHES "Coverage")
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # Default to universal binary on Mac OS X unless user has overriden
- if (NOT DEFINED CMAKE_OSX_ARCHITECTURES OR "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
- set(CMAKE_OSX_ARCHITECTURES "i386;x86_64")
+ if (NOT CMAKE_OSX_ARCHITECTURES)
+ set(CMAKE_OSX_ARCHITECTURES "x86_64")
+ set(LIB_SUFFIX "")
+ set(CMAKE_MACOSX_RPATH ON)
endif ()
endif ()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/7] qpid-proton git commit: PROTON-522: We don't want to allow IPv4
addresses if only IPv6 is present - Not even mapped addresses.
Posted by as...@apache.org.
PROTON-522: We don't want to allow IPv4 addresses if only IPv6 is present
- Not even mapped addresses.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d82bbfab
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d82bbfab
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d82bbfab
Branch: refs/heads/master
Commit: d82bbfab037c97e1c403ae701f1b3fe272813ff7
Parents: b6ad8a9
Author: Andrew Stitcher <as...@apache.org>
Authored: Thu Nov 23 03:15:52 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500
----------------------------------------------------------------------
proton-c/src/proactor/libuv.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d82bbfab/proton-c/src/proactor/libuv.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/libuv.c b/proton-c/src/proactor/libuv.c
index 0e5437d..4819646 100644
--- a/proton-c/src/proactor/libuv.c
+++ b/proton-c/src/proactor/libuv.c
@@ -552,10 +552,7 @@ static int leader_resolve(pn_proactor_t *p, addr_t *addr, bool listen) {
struct addrinfo hints = { 0 };
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- /* Note this looks contradictory since we disable V4 mapping in bind() but it is
- correct - read the getaddrinfo man page carefully!
- */
- hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
+ hints.ai_flags = AI_ADDRCONFIG;
if (listen) {
hints.ai_flags |= AI_PASSIVE | AI_ALL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[6/7] qpid-proton git commit: PROTON-1644/PROTON-522: [Partial fix]
Change port choosing mechanism for C++ tests - Detect FreeBSD and MacOS X
Posted by as...@apache.org.
PROTON-1644/PROTON-522: [Partial fix] Change port choosing mechanism for C++ tests
- Detect FreeBSD and MacOS X
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b6ad8a99
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b6ad8a99
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b6ad8a99
Branch: refs/heads/master
Commit: b6ad8a996faa34aeb8e475902a6f151c5476d45f
Parents: 43e49f6
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Nov 13 12:52:06 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/src/test_port.hpp | 31 ++++++++++++++++++++++++++++
proton-c/src/tests/test_port.h | 6 +++++-
2 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6ad8a99/proton-c/bindings/cpp/src/test_port.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/test_port.hpp b/proton-c/bindings/cpp/src/test_port.hpp
index eb94e84..5d2fada 100644
--- a/proton-c/bindings/cpp/src/test_port.hpp
+++ b/proton-c/bindings/cpp/src/test_port.hpp
@@ -59,6 +59,37 @@ class test_socket {
void close_early() { closesocket(sock_); } // Windows won't allow two sockets on a port
};
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+
+// BSD derivatives don't support the same SO_REUSEADDR semantics as Linux so
+// do the same thing as windows and hope for the best
+extern "C" {
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <unistd.h>
+# include <netdb.h>
+}
+
+void check_err(int ret, const std::string& what) {
+ if (ret) throw std::runtime_error(what + ": " + std::strerror(errno));
+}
+
+class test_socket {
+ public:
+ int sock_;
+ test_socket() : sock_(socket(AF_INET, SOCK_STREAM, 0)) {
+ check_err(sock_ < 0, "socket");
+ int on = 1;
+ check_err(setsockopt(sock_, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)),
+ "setsockop");
+ }
+ ~test_socket() { }
+ void close_early() {
+ close(sock_);
+ }
+};
+
#else /* POSIX */
extern "C" {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b6ad8a99/proton-c/src/tests/test_port.h
----------------------------------------------------------------------
diff --git a/proton-c/src/tests/test_port.h b/proton-c/src/tests/test_port.h
index 0569c44..959e597 100644
--- a/proton-c/src/tests/test_port.h
+++ b/proton-c/src/tests/test_port.h
@@ -106,7 +106,7 @@ test_port_t test_port(const char* host) {
check_err(tp.sock < 0, "socket");
#ifndef _WIN32
int on = 1;
- check_err(setsockopt(tp.sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)), "setsockopt");;;
+ check_err(setsockopt(tp.sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)), "setsockopt");
#endif
struct sockaddr_in addr = {0};
addr.sin_family = AF_INET; /* set the type of connection to TCP/IP */
@@ -122,6 +122,8 @@ test_port_t test_port(const char* host) {
test_port_use_host(&tp, host);
#ifdef _WIN32 /* Windows doesn't support the twice-open socket trick */
closesocket(tp.sock);
+#elif defined (__APPLE__) || defined(__FreeBSD__)
+ close(tp.sock);
#endif
return tp;
}
@@ -129,6 +131,8 @@ test_port_t test_port(const char* host) {
void test_port_close(test_port_t *tp) {
#ifdef _WIN32
WSACleanup();
+#elif defined (__APPLE__) || defined(__FreeBSD__)
+ // We already closed and have no other cleanup to do
#else
close(tp->sock);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/7] qpid-proton git commit: PROTON-1342: CI on OS X - configured
travis matrix with osx_images for Xcode 7.3 10.11 and Xcode 9 10.13 with
SASL_IMPL none and PROACTOR libuv
Posted by as...@apache.org.
PROTON-1342: CI on OS X - configured travis matrix with osx_images for Xcode 7.3 10.11 and Xcode 9 10.13 with SASL_IMPL none and PROACTOR libuv
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6dddff29
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6dddff29
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6dddff29
Branch: refs/heads/master
Commit: 6dddff298ed220ec4621e61eabb4b4cb8ab908fd
Parents: f07322d
Author: Roddie Kieley <rk...@unifiedsoftworx.com>
Authored: Wed Nov 1 23:31:37 2017 -0230
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500
----------------------------------------------------------------------
.travis.yml | 31 ++++++++++++++++++++++++-------
README.md | 6 +++---
2 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6dddff29/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f162dcb..b6d6c7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,19 +17,36 @@
# under the License
#
-os: linux
sudo: false
language: cpp
compiler:
- gcc
- clang
-env:
-- QPID_PROTON_CMAKE_ARGS=
-- QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+
matrix:
- exclude:
- - compiler: clang
- env: QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+ include:
+ - os: linux
+ env:
+ - QPID_PROTON_CMAKE_ARGS='-DCMAKE_BUILD_TYPE=Coverage'
+
+ - os: osx
+ osx_image: xcode7.3
+ env:
+ - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11'
+ before_install:
+ - brew update
+ - brew install libuv openssl
+
+ - os: osx
+ osx_image: xcode9
+ env:
+ - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
+ before_install:
+ - brew update
+ - brew install libuv openssl
+
+# Note addons is apt specific at the moment and will not be applied for osx.
+# See before_install brew commands below
addons:
apt:
packages:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6dddff29/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8b34f63..b1bca51 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
Qpid Proton - AMQP messaging toolkit
====================================
-Linux Build | Windows Build
-------------|--------------
-[](https://travis-ci.org/apache/qpid-proton) | [](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master)
+Linux/OSX Build | Windows Build
+----------------|---------------
+[](https://travis-ci.org/apache/qpid-proton) | [](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master)
Qpid Proton is a high-performance, lightweight messaging library. It can be
used in the widest range of messaging applications, including brokers, client
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/7] qpid-proton git commit: PROTON-522: Apache Qpid Proton on
Mac/OSX
Posted by as...@apache.org.
PROTON-522: Apache Qpid Proton on Mac/OSX
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/43e49f69
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/43e49f69
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/43e49f69
Branch: refs/heads/master
Commit: 43e49f69cda68afc948a8d9081084dea70cb960c
Parents: e9480cb
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Nov 10 15:43:42 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/internal/config.hpp | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/43e49f69/proton-c/bindings/cpp/include/proton/internal/config.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/internal/config.hpp b/proton-c/bindings/cpp/include/proton/internal/config.hpp
index 9af12c2..42de663 100644
--- a/proton-c/bindings/cpp/include/proton/internal/config.hpp
+++ b/proton-c/bindings/cpp/include/proton/internal/config.hpp
@@ -33,6 +33,16 @@
/// default. Otherwise they can be enabled or disabled separately
/// with -D on the compile line.
+/// The Apple clang compiler doesn't really support PN_CPP_HAS_THREAD_LOCAL
+/// before Xcode 8 even though it claims to be C++11 compatible
+#if defined(__clang__) && defined(__apple_build_version__) && ((__clang_major__ * 100) + __clang_minor__) >= 301
+#if __has_feature(cxx_thread_local)
+#define PN_CPP_HAS_THREAD_LOCAL 1
+#else
+#define PN_CPP_HAS_THREAD_LOCAL 0
+#endif
+#endif
+
#ifndef PN_CPP_HAS_CPP11
#if defined(__cplusplus) && __cplusplus >= 201103
#define PN_CPP_HAS_CPP11 1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/7] qpid-proton git commit: PROTON-1696/PROTON-522: Go Anonymous
SASL test should work even without Cyrus SASL installed - It was relying on
saslpasswd2 even when it didn't need to
Posted by as...@apache.org.
PROTON-1696/PROTON-522: Go Anonymous SASL test should work even without Cyrus SASL installed
- It was relying on saslpasswd2 even when it didn't need to
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f07322d9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f07322d9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f07322d9
Branch: refs/heads/master
Commit: f07322d9c596e334f4eef8f14d0c41ff3b3e8704
Parents: ef33dd6
Author: Andrew Stitcher <as...@apache.org>
Authored: Tue Nov 14 10:30:55 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:21 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f07322d9/proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go b/proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go
index 9eb48c0..4941350 100644
--- a/proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go
+++ b/proton-c/bindings/go/src/qpid.apache.org/electron/auth_test.go
@@ -48,7 +48,7 @@ func testAuthClientServer(t *testing.T, copts []ConnectionOption, sopts []Connec
}
func TestAuthAnonymous(t *testing.T) {
- fatalIf(t, configureSASL())
+ configureSASL()
got, err := testAuthClientServer(t,
[]ConnectionOption{User("fred"), VirtualHost("vhost"), SASLAllowInsecure(true)},
[]ConnectionOption{SASLAllowedMechs("ANONYMOUS"), SASLAllowInsecure(true)})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org