svn commit: r1691457 - /qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
Author: shuston Date: Thu Jul 16 21:54:11 2015 New Revision: 1691457 URL: http://svn.apache.org/r1691457 Log: Doc fixes per QPID-6648. Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=1691457r1=1691456r2=1691457view=diff == --- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original) +++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Thu Jul 16 21:54:11 2015 @@ -50,54 +50,54 @@ class QPID_MESSAGING_CLASS_EXTERN Receiv QPID_MESSAGING_EXTERN ~Receiver(); QPID_MESSAGING_EXTERN Receiver operator=(const Receiver); /** - * Retrieves a message from this receivers local queue, or waits - * for upto the specified timeout for a message to become + * Retrieves a message from this Receiver's local queue or waits + * for up to the specified timeout for a message to become * available. */ QPID_MESSAGING_EXTERN bool get(Message message, Duration timeout=Duration::FOREVER); /** - * Retrieves a message from this receivers local queue, or waits + * Retrieves a message from this Receiver's local queue or waits * for up to the specified timeout for a message to become * available. * * @exception NoMessageAvailable if there is no message to give * after waiting for the specified timeout, or if the Receiver is - * closed, in which case isClose() will be true. + * closed, in which case isClosed() will be true. */ QPID_MESSAGING_EXTERN Message get(Duration timeout=Duration::FOREVER); /** - * Retrieves a message for this receivers subscription or waits + * Retrieves a message from this Receiver's subscription or waits * for up to the specified timeout for one to become - * available. Unlike get() this method will check with the server + * available. Unlike get(), this method will check with the server * that there is no message for the subscription this receiver is * serving before returning false. * - * @return false if there is no message to give after - * waiting for the specified timeout, or if the Receiver is - * closed, in which case isClose() will be true. + * @return false if there is no message available after + * waiting for the specified time period, or if the receiver is + * closed, in which case isClosed() will be true. */ QPID_MESSAGING_EXTERN bool fetch(Message message, Duration timeout=Duration::FOREVER); /** - * Retrieves a message for this receivers subscription or waits + * Retrieves a message for this Receiver's subscription or waits * for up to the specified timeout for one to become - * available. Unlike get() this method will check with the server + * available. Unlike get(), this method will check with the server * that there is no message for the subscription this receiver is * serving before throwing an exception. * - * @exception NoMessageAvailable if there is no message to give + * @exception NoMessageAvailable if there is no message available * after waiting for the specified timeout, or if the Receiver is * closed, in which case isClose() will be true. */ QPID_MESSAGING_EXTERN Message fetch(Duration timeout=Duration::FOREVER); /** - * Sets the capacity for the receiver. The capacity determines how - * many incoming messages can be held in the receiver before being + * Sets the capacity for the Receiver. The capacity determines how + * many incoming messages can be held in the Receiver before being * requested by a client via fetch() (or pushed to a listener). */ QPID_MESSAGING_EXTERN void setCapacity(uint32_t); /** - * @return the capacity of the receiver. The capacity determines - * how many incoming messages can be held in the receiver before + * @return the capacity of the Receiver. The capacity determines + * how many incoming messages can be held in the Receiver before * being requested by a client via fetch() (or pushed to a * listener). */ @@ -108,35 +108,35 @@ class QPID_MESSAGING_CLASS_EXTERN Receiv */ QPID_MESSAGING_EXTERN uint32_t getAvailable(); /** - * @return a count of the number of messages received on this - * receiver that have been acknowledged, but for which that + * @return the number of messages received on this + * Receiver that have been acknowledged, but for which that * acknowledgement has not yet been confirmed as processed by the * server. */ QPID_MESSAGING_EXTERN uint32_t getUnsettled(); /** - * Cancels this receiver. + * Cancels this Receiver. */ QPID_MESSAGING_EXTERN void close
svn commit: r1688939 - /qpid/branches/qpid-cpp-0.34-rc-winpkg/
Author: shuston Date: Fri Jul 3 00:46:41 2015 New Revision: 1688939 URL: http://svn.apache.org/r1688939 Log: Branch to build installer(s) for Windows. Added: qpid/branches/qpid-cpp-0.34-rc-winpkg/ (props changed) - copied from r1687472, qpid/branches/qpid-cpp-0.34-rc/qpid/ Propchange: qpid/branches/qpid-cpp-0.34-rc-winpkg/ -- --- svk:merge (added) +++ svk:merge Fri Jul 3 00:46:41 2015 @@ -0,0 +1,3 @@ +8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:1224 +c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid-trunk:1612 +c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:1616 Propchange: qpid/branches/qpid-cpp-0.34-rc-winpkg/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jul 3 00:46:41 2015 @@ -0,0 +1,9 @@ +/qpid/branches/0.5.x-dev/qpid:892761,894875 +/qpid/branches/0.6-release-windows-installer:926803 +/qpid/branches/0.6-release-windows-installer/qpid:926803,927233 +/qpid/branches/QPID-6262-JavaBrokerNIO/qpid:1643238-1666219 +/qpid/branches/java-broker-bdb-ha2/qpid:1576683-1583556 +/qpid/branches/java-network-refactor/qpid:805429-825319 +/qpid/branches/mcpierce-QPID-4719/qpid:1477004-1477093 +/qpid/branches/qpid-2935/qpid:1061302-1072333 +/qpid/branches/qpid-3346/qpid:1144319-1179855 Propchange: qpid/branches/qpid-cpp-0.34-rc-winpkg/ -- --- svnmerge-blocked (added) +++ svnmerge-blocked Fri Jul 3 00:46:41 2015 @@ -0,0 +1 @@ +/incubator/qpid/branches/M2:532787,532791,537171,539594,540169,540511,553447,565284,574873,574876,575688,577316,577660,578048,578061,578765,578850 /incubator/qpid/branches/qpid.0-9:492777,496596 Propchange: qpid/branches/qpid-cpp-0.34-rc-winpkg/ -- Binary property 'svnmerge-integrated' - no diff available. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1667349 - in /qpid/trunk/qpid/cpp/src/tests: CMakeLists.txt run_test run_test.ps1 test_env.ps1.in
Author: shuston
Date: Tue Mar 17 16:15:37 2015
New Revision: 1667349
URL: http://svn.apache.org/r1667349
Log:
Align run_test shell and Powershell versions. Changes the option syntax from
two-hyphen to one. Fixes QPID-6399.
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
qpid/trunk/qpid/cpp/src/tests/run_test
qpid/trunk/qpid/cpp/src/tests/run_test.ps1
qpid/trunk/qpid/cpp/src/tests/test_env.ps1.in
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1667349r1=1667348r2=1667349view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Tue Mar 17 16:15:37 2015
@@ -148,8 +148,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (shell powershell)
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
-set(test_wrap ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_test${test_script_suffix}
--build-dir=${CMAKE_BINARY_DIR})
-set(python_wrap ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_test${test_script_suffix}
--build-dir=${CMAKE_BINARY_DIR} --python)
+set(test_wrap ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_test${test_script_suffix} -buildDir
${CMAKE_BINARY_DIR})
+set(python_wrap ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_test${test_script_suffix} -buildDir
${CMAKE_BINARY_DIR} -python)
if (BUILD_TESTING_UNITTESTS)
@@ -242,7 +242,7 @@ target_link_libraries (unit_test
set_target_properties (unit_test PROPERTIES COMPILE_DEFINITIONS
_IN_QPID_BROKER)
remember_location(unit_test)
-add_test (unit_test ${test_wrap} --boost-test -- ${unit_test_LOCATION})
+add_test (unit_test ${test_wrap} -boostTest -- ${unit_test_LOCATION})
endif (BUILD_TESTING_UNITTESTS)
@@ -348,14 +348,14 @@ if (BUILD_SASL)
add_test(ssl_test ${test_wrap} --
${CMAKE_CURRENT_SOURCE_DIR}/ssl_test${test_script_suffix})
endif (BUILD_SSL)
endif (BUILD_SASL)
-add_test (qpid-client-test ${test_wrap} --start-broker --
${qpid-client-test_LOCATION})
-add_test (quick_perftest ${test_wrap} --start-broker --
${qpid-perftest_LOCATION} --summary --count 100)
-add_test (quick_topictest ${test_wrap} --start-broker --
${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix})
-add_test (quick_txtest ${test_wrap} --start-broker -- ${qpid-txtest_LOCATION}
--queues 4 --tx-count 10 --quiet)
-add_test (quick_txtest2 ${test_wrap} --start-broker --
${qpid-txtest2_LOCATION} --queues 4 --tx-count 10 --quiet)
-add_test (msg_group_tests ${test_wrap} --start-broker --
${CMAKE_CURRENT_SOURCE_DIR}/run_msg_group_tests${test_script_suffix})
-add_test (run_header_test ${test_wrap} --start-broker --
${CMAKE_CURRENT_SOURCE_DIR}/run_header_test${test_script_suffix})
-add_test (python_tests ${test_wrap} --start-broker --
${CMAKE_CURRENT_SOURCE_DIR}/python_tests${test_script_suffix})
+add_test (qpid-client-test ${test_wrap} -startBroker --
${qpid-client-test_LOCATION})
+add_test (quick_perftest ${test_wrap} -startBroker --
${qpid-perftest_LOCATION} --summary --count 100)
+add_test (quick_topictest ${test_wrap} -startBroker --
${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix})
+add_test (quick_txtest ${test_wrap} -startBroker -- ${qpid-txtest_LOCATION}
--queues 4 --tx-count 10 --quiet)
+add_test (quick_txtest2 ${test_wrap} -startBroker -- ${qpid-txtest2_LOCATION}
--queues 4 --tx-count 10 --quiet)
+add_test (msg_group_tests ${test_wrap} -startBroker --
${CMAKE_CURRENT_SOURCE_DIR}/run_msg_group_tests${test_script_suffix})
+add_test (run_header_test ${test_wrap} -startBroker --
${CMAKE_CURRENT_SOURCE_DIR}/run_header_test${test_script_suffix})
+add_test (python_tests ${test_wrap} -startBroker --
${CMAKE_CURRENT_SOURCE_DIR}/python_tests${test_script_suffix})
if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
# paged queue not yet implemented for windows
add_test (paged_queue_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_paged_queue_tests${test_script_suffix})
@@ -377,7 +377,7 @@ add_test (federation_tests ${shell} ${CM
add_test (federation_sys_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_federation_sys_tests${test_script_suffix})
add_test (queue_flow_limit_tests
${test_wrap}
- --start-broker --broker-options=--default-flow-stop-threshold=80
--default-flow-resume-threshold=70
+ -startBroker -brokerOptions --default-flow-stop-threshold=80
--default-flow-resume-threshold=70
--
${CMAKE_CURRENT_SOURCE_DIR}/run_queue_flow_limit_tests${test_script_suffix})
if (BUILD_ACL)
add_test (acl_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_acl_tests${test_script_suffix})
Modified: qpid/trunk/qpid/cpp/src/tests/run_test
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_test?rev=1667349r1=1667348r2=1667349view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_test (original
svn commit: r1663828 - /qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
Author: shuston
Date: Tue Mar 3 23:09:54 2015
New Revision: 1663828
URL: http://svn.apache.org/r1663828
Log:
Fix possible double-free discussed in QPID-6368
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h?rev=1663828r1=1663827r2=1663828view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableQueue.h Tue Mar 3 23:09:54
2015
@@ -25,7 +25,6 @@
#include string
#include qpid/broker/Persistable.h
#include qpid/management/Manageable.h
-#include boost/shared_ptr.hpp
namespace qpid {
namespace broker {
@@ -51,12 +50,12 @@ public:
class PersistableQueue : public Persistable
{
public:
-typedef boost::shared_ptrPersistableQueue shared_ptr;
-
virtual const std::string getName() const = 0;
virtual ~PersistableQueue() {
-if (externalQueueStore)
+if (externalQueueStore) {
delete externalQueueStore;
+ externalQueueStore = 0;
+}
};
virtual void setExternalQueueStore(ExternalQueueStore* inst) = 0;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1662294 - in /qpid/branches/0.32/qpid/cpp/CMakeModules: CheckSizeTNativeType.cmake CheckSizetDistinct.cmake
Author: shuston
Date: Wed Feb 25 18:50:59 2015
New Revision: 1662294
URL: http://svn.apache.org/r1662294
Log:
Somehow did not include these in commit r1662027 for QPID-6312
Added:
qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake (with
props)
Removed:
qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake
Added: qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake?rev=1662294view=auto
==
--- qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake (added)
+++ qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake Wed Feb
25 18:50:59 2015
@@ -0,0 +1,56 @@
+#
+# 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.
+#
+
+# This module checks to see if size_t is a distinct type from the other
+# integer types already set up in IntegerTypes.h.
+
+INCLUDE (CheckCXXSourceCompiles)
+
+FUNCTION (check_size_t_distinct VARIABLE)
+ # No need to check if we already did. If you want to re-run, clear it
+ # from the cache.
+ if (${VARIABLE} MATCHES ^${VARIABLE}$)
+message (STATUS Checking to see if size_t is a distinct type)
+set (CMAKE_REQUIRED_QUIET ON)
+set (CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/include)
+CHECK_CXX_SOURCE_COMPILES (
+
+#include iostream
+#include \qpid/sys/IntegerTypes.h\
+// Define functions that will fail to compile if size_t is the same as
+// one of the int types defined in IntegerTypes.h
+int foo(int16_t){ return 1; }
+int foo(int32_t){ return 2; }
+int foo(int64_t){ return 3; }
+int foo(uint16_t) { return 4; }
+int foo(uint32_t) { return 5; }
+int foo(uint64_t) { return 6; }
+int foo(size_t) { return 7; }
+int main (int, char *[]) {
+ return 0;
+}
+
+${VARIABLE})
+if (${VARIABLE})
+ message (STATUS Checking to see if size_t is a distinct type - yes)
+else (${VARIABLE})
+ message (STATUS Checking to see if size_t is a distinct type - no)
+endif (${VARIABLE})
+ endif (${VARIABLE} MATCHES ^${VARIABLE}$)
+ENDFUNCTION (check_size_t_distinct VARIABLE)
Propchange: qpid/branches/0.32/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
--
svn:executable = *
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1662025 - /qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
Author: shuston
Date: Tue Feb 24 16:59:31 2015
New Revision: 1662025
URL: http://svn.apache.org/r1662025
Log:
Fix up/remove pasted comments re Linux per Andrew's review comments in review
for QPID-6312
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp?rev=1662025r1=1662024r2=1662025view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp Tue Feb 24 16:59:31 2015
@@ -44,11 +44,7 @@ namespace qpid {
namespace sys {
long SystemInfo::concurrency() {
-#ifdef _SC_NPROCESSORS_ONLN// Linux specific.
return sysconf(_SC_NPROCESSORS_ONLN);
-#else
-return -1;
-#endif
}
bool SystemInfo::getLocalHostname (Address address) {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1662026 - in /qpid/branches/0.32/qpid/cpp/src/qpid/sys: ./ aix/ aix/SystemInfo.cpp
Author: shuston
Date: Tue Feb 24 17:01:28 2015
New Revision: 1662026
URL: http://svn.apache.org/r1662026
Log:
Merge SystemInfo.cpp to 0.32 - QPID-6312
Added:
qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/
- copied from r1661449, qpid/trunk/qpid/cpp/src/qpid/sys/aix/
Modified:
qpid/branches/0.32/qpid/cpp/src/qpid/sys/ (props changed)
qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
Propchange: qpid/branches/0.32/qpid/cpp/src/qpid/sys/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 24 17:01:28 2015
@@ -0,0 +1,9 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/sys:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/sys:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/sys:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/sys:1072051-1079078
+/qpid/branches/java-broker-bdb-ha2/qpid/cpp/src/qpid/sys:1576683-1583556
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/sys:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/sys:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/sys:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/sys:1661449
Modified: qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp?rev=1662026r1=1661449r2=1662026view=diff
==
--- qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp (original)
+++ qpid/branches/0.32/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp Tue Feb 24
17:01:28 2015
@@ -44,11 +44,7 @@ namespace qpid {
namespace sys {
long SystemInfo::concurrency() {
-#ifdef _SC_NPROCESSORS_ONLN// Linux specific.
return sysconf(_SC_NPROCESSORS_ONLN);
-#else
-return -1;
-#endif
}
bool SystemInfo::getLocalHostname (Address address) {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1662027 - in /qpid/branches/0.32/qpid/cpp/src: ./ CMakeLists.txt config.h.cmake qpid/Options.cpp
Author: shuston
Date: Tue Feb 24 17:07:39 2015
New Revision: 1662027
URL: http://svn.apache.org/r1662027
Log:
Merge r1661450 changes (size_t detect) into 0.32 as approved in QPID-6312
Modified:
qpid/branches/0.32/qpid/cpp/src/ (props changed)
qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt (contents, props changed)
qpid/branches/0.32/qpid/cpp/src/config.h.cmake
qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp
Propchange: qpid/branches/0.32/qpid/cpp/src/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 17:07:39 2015
@@ -6,3 +6,4 @@
/qpid/branches/java-network-refactor/qpid/cpp/src:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/src:1061302-1072333
/qpid/branches/qpid-3346/qpid/cpp/src:1144319-1179855
+/qpid/trunk/qpid/cpp/src:1661450
Modified: qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt?rev=1662027r1=1662026r2=1662027view=diff
==
--- qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt Tue Feb 24 17:07:39 2015
@@ -42,7 +42,7 @@ include(CheckIncludeFiles)
include(CheckIncludeFileCXX)
include(CheckLibraryExists)
include(CheckSymbolExists)
-include(CheckSizeTNativeType)
+include(CheckSizetDistinct)
find_package(PkgConfig)
find_package(Ruby)
@@ -351,7 +351,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windo
mark_as_advanced(QPID_POLLER)
endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-check_size_t_native_type (QPID_SIZE_T_NATIVE)
+check_size_t_distinct (QPID_SIZE_T_DISTINCT)
option(BUILD_SASL Build with Cyrus SASL support ${SASL_FOUND})
if (BUILD_SASL)
Propchange: qpid/branches/0.32/qpid/cpp/src/CMakeLists.txt
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 17:07:39 2015
@@ -7,3 +7,4 @@
/qpid/branches/qpid-2393/qpid/cpp/src/CMakeLists.txt:1375790-1376954
/qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333
/qpid/branches/qpid-3346/qpid/cpp/src/CMakeLists.txt:1144319-1179855
+/qpid/trunk/qpid/cpp/src/CMakeLists.txt:1661450
Modified: qpid/branches/0.32/qpid/cpp/src/config.h.cmake
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/config.h.cmake?rev=1662027r1=1662026r2=1662027view=diff
==
--- qpid/branches/0.32/qpid/cpp/src/config.h.cmake (original)
+++ qpid/branches/0.32/qpid/cpp/src/config.h.cmake Tue Feb 24 17:07:39 2015
@@ -56,7 +56,7 @@
#cmakedefine HAVE_SYS_SDT_H ${HAVE_SYS_SDT_H}
#cmakedefine HAVE_LOG_AUTHPRIV
#cmakedefine HAVE_LOG_FTP
-#cmakedefine QPID_SIZE_T_NATIVE
+#cmakedefine QPID_SIZE_T_DISTINCT
#cmakedefine HAVE_PROTON_TRACER
#cmakedefine USE_PROTON_TRANSPORT_CONDITION
#cmakedefine HAVE_PROTON_EVENTS
Modified: qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp?rev=1662027r1=1662026r2=1662027view=diff
==
--- qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp (original)
+++ qpid/branches/0.32/qpid/cpp/src/qpid/Options.cpp Tue Feb 24 17:07:39 2015
@@ -146,7 +146,7 @@ template QPID_COMMON_EXTERN po::value_se
template QPID_COMMON_EXTERN po::value_semantic* create_value(uint16_t val,
const std::string arg);
template QPID_COMMON_EXTERN po::value_semantic* create_value(uint32_t val,
const std::string arg);
template QPID_COMMON_EXTERN po::value_semantic* create_value(uint64_t val,
const std::string arg);
-#ifdef QPID_SIZE_T_NATIVE
+#ifdef QPID_SIZE_T_DISTINCT
template QPID_COMMON_EXTERN po::value_semantic* create_value(size_t val,
const std::string arg);
#endif
template QPID_COMMON_EXTERN po::value_semantic* create_value(double val,
const std::string arg);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1661830 - /qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h
Author: shuston
Date: Tue Feb 24 01:51:14 2015
New Revision: 1661830
URL: http://svn.apache.org/r1661830
Log:
Don't take the address of a 0-length vector. Fixes QPID-6409.
Modified:
qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h
Modified: qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h?rev=1661830r1=1661829r2=1661830view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/BrokerFixture.h Tue Feb 24 01:51:14 2015
@@ -101,11 +101,13 @@ struct BrokerFixture : private boost::n
opts.auth=false;
// Argument parsing
-std::vectorconst char* argv(args.size());
-for (size_t i = 0; iargs.size(); ++i)
-argv[i] = args[i].c_str();
-Plugin::addOptions(opts);
-opts.parse(argv.size(), argv[0]);
+if (args.size() 0) {
+std::vectorconst char* argv(args.size());
+for (size_t i = 0; iargs.size(); ++i)
+argv[i] = args[i].c_str();
+Plugin::addOptions(opts);
+opts.parse(argv.size(), argv[0]);
+}
broker = Broker::create(opts);
// TODO aconway 2007-12-05: At one point BrokerFixture
// tests could hang in Connection ctor if the following
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1661450 - in /qpid/trunk/qpid/cpp: CMakeModules/CheckSizeTNativeType.cmake CMakeModules/CheckSizetDistinct.cmake src/CMakeLists.txt src/config.h.cmake src/qpid/Options.cpp
Author: shuston
Date: Sun Feb 22 00:27:37 2015
New Revision: 1661450
URL: http://svn.apache.org/r1661450
Log:
Replace non-Apache licensed CheckSizeTNativeType.cmake with ASF-licensed and
more correct for our needs, CheckSizetDistinct.cmake. Resolves QPID-6312.
Added:
qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake (with props)
Removed:
qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/Options.cpp
Added: qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake?rev=1661450view=auto
==
--- qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake (added)
+++ qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake Sun Feb 22
00:27:37 2015
@@ -0,0 +1,56 @@
+#
+# 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.
+#
+
+# This module checks to see if size_t is a distinct type from the other
+# integer types already set up in IntegerTypes.h.
+
+INCLUDE (CheckCXXSourceCompiles)
+
+FUNCTION (check_size_t_distinct VARIABLE)
+ # No need to check if we already did. If you want to re-run, clear it
+ # from the cache.
+ if (${VARIABLE} MATCHES ^${VARIABLE}$)
+message (STATUS Checking to see if size_t is a distinct type)
+set (CMAKE_REQUIRED_QUIET ON)
+set (CMAKE_REQUIRED_INCLUDES ${CMAKE_SOURCE_DIR}/include)
+CHECK_CXX_SOURCE_COMPILES (
+
+#include iostream
+#include \qpid/sys/IntegerTypes.h\
+// Define functions that will fail to compile if size_t is the same as
+// one of the int types defined in IntegerTypes.h
+int foo(int16_t){ return 1; }
+int foo(int32_t){ return 2; }
+int foo(int64_t){ return 3; }
+int foo(uint16_t) { return 4; }
+int foo(uint32_t) { return 5; }
+int foo(uint64_t) { return 6; }
+int foo(size_t) { return 7; }
+int main (int, char *[]) {
+ return 0;
+}
+
+${VARIABLE})
+if (${VARIABLE})
+ message (STATUS Checking to see if size_t is a distinct type - yes)
+else (${VARIABLE})
+ message (STATUS Checking to see if size_t is a distinct type - no)
+endif (${VARIABLE})
+ endif (${VARIABLE} MATCHES ^${VARIABLE}$)
+ENDFUNCTION (check_size_t_distinct VARIABLE)
Propchange: qpid/trunk/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
--
svn:executable = *
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1661450r1=1661449r2=1661450view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Sun Feb 22 00:27:37 2015
@@ -42,7 +42,7 @@ include(CheckIncludeFiles)
include(CheckIncludeFileCXX)
include(CheckLibraryExists)
include(CheckSymbolExists)
-include(CheckSizeTNativeType)
+include(CheckSizetDistinct)
find_package(PkgConfig)
find_package(Ruby)
@@ -351,7 +351,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windo
mark_as_advanced(QPID_POLLER)
endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-check_size_t_native_type (QPID_SIZE_T_NATIVE)
+check_size_t_distinct (QPID_SIZE_T_DISTINCT)
option(BUILD_SASL Build with Cyrus SASL support ${SASL_FOUND})
if (BUILD_SASL)
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=1661450r1=1661449r2=1661450view=diff
==
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Sun Feb 22 00:27:37 2015
@@ -56,7 +56,7 @@
#cmakedefine HAVE_SYS_SDT_H ${HAVE_SYS_SDT_H}
#cmakedefine HAVE_LOG_AUTHPRIV
#cmakedefine HAVE_LOG_FTP
-#cmakedefine QPID_SIZE_T_NATIVE
+#cmakedefine QPID_SIZE_T_DISTINCT
#cmakedefine HAVE_PROTON_TRACER
#cmakedefine USE_PROTON_TRANSPORT_CONDITION
#cmakedefine HAVE_PROTON_EVENTS
Modified: qpid/trunk/qpid/cpp/src/qpid/Options.cpp
URL:
http://svn.apache.org/viewvc/qpid
svn commit: r1661449 - in /qpid/trunk/qpid/cpp/src/qpid/sys/aix: ./ SystemInfo.cpp
Author: shuston
Date: Sun Feb 22 00:24:31 2015
New Revision: 1661449
URL: http://svn.apache.org/r1661449
Log:
Add missing AIX-needed SystemInfo.cpp source; relates to QPID-6312, 0003
attachment
Added:
qpid/trunk/qpid/cpp/src/qpid/sys/aix/
qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp (with props)
Added: qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp?rev=1661449view=auto
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp (added)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp Sun Feb 22 00:24:31 2015
@@ -0,0 +1,205 @@
+/*
+ * 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 qpid/log/Statement.h
+#include qpid/sys/SystemInfo.h
+#include qpid/sys/posix/check.h
+#include qpid/sys/posix/PrivatePosix.h
+#include procinfo.h
+#include arpa/inet.h
+#include net/if.h
+#include sys/ioctl.h
+#include sys/socket.h
+#include sys/types.h
+#include sys/utsname.h
+#include unistd.h
+#include map
+#include netdb.h
+#include string.h
+
+#ifndef HOST_NAME_MAX
+# define HOST_NAME_MAX 256
+#endif
+
+using namespace std;
+
+namespace qpid {
+namespace sys {
+
+long SystemInfo::concurrency() {
+#ifdef _SC_NPROCESSORS_ONLN// Linux specific.
+return sysconf(_SC_NPROCESSORS_ONLN);
+#else
+return -1;
+#endif
+}
+
+bool SystemInfo::getLocalHostname (Address address) {
+char name[HOST_NAME_MAX];
+if (::gethostname(name, sizeof(name)) != 0)
+return false;
+address.host = name;
+return true;
+}
+
+static const string LOOPBACK(127.0.0.1);
+static const string TCP(tcp);
+
+// Test IPv4 address for loopback
+inline bool IN_IS_ADDR_LOOPBACK(const ::in_addr* a) {
+return ((ntohl(a-s_addr) 0xff00) == 0x7f00);
+}
+
+inline bool isLoopback(const ::sockaddr* addr) {
+switch (addr-sa_family) {
+case AF_INET: return IN_IS_ADDR_LOOPBACK(((const
::sockaddr_in*)(const void*)addr)-sin_addr);
+case AF_INET6: return IN6_IS_ADDR_LOOPBACK(((const
::sockaddr_in6*)(const void*)addr)-sin6_addr);
+default: return false;
+}
+}
+
+namespace {
+class HandleCloser : public IOHandle {
+public:
+ HandleCloser(int fd) : IOHandle(fd) {}
+ ~HandleCloser() { ::close(fd); fd = -1; }
+};
+
+inline bool isInetOrInet6(::sockaddr* sa) {
+switch (sa-sa_family) {
+case AF_INET:
+case AF_INET6:
+return true;
+default:
+return false;
+}
+}
+
+inline void *InetAddr(::sockaddr* sa) {
+switch (sa-sa_family) {
+case AF_INET:
+return (reinterpret_caststruct sockaddr_in *(sa)-sin_addr);
+case AF_INET6:
+return (reinterpret_caststruct sockaddr_in6
*(sa)-sin6_addr);
+default:
+return 0;
+}
+}
+
+typedef std::mapstd::string, std::vectorstd::string InterfaceInfo;
+std::mapstd::string, std::vectorstd::string cachedInterfaces;
+
+void cacheInterfaceInfo() {
+int status = 0;
+int handle = ::socket (PF_INET, SOCK_DGRAM, 0);
+QPID_POSIX_CHECK(handle);
+HandleCloser h(handle);
+
+size_t num_ifs = 0;
+struct ifconf ifc;
+status = ::ioctl(handle, SIOCGSIZIFCONF, (caddr_t)ifc.ifc_len);
+QPID_POSIX_CHECK(status);
+
+std::auto_ptrchar auto_ifc_buf(new char[ifc.ifc_len]);
+memset (auto_ifc_buf.get(), 0, ifc.ifc_len);
+
+status = ::ioctl(handle, SIOCGIFCONF, (caddr_t)auto_ifc_buf.get());
+QPID_POSIX_CHECK(status);
+
+char *buf_start = auto_ifc_buf.get();
+char *buf_end = buf_start + ifc.ifc_len;
+
+for (char *ptr = buf_start; ptr buf_end; ) {
+struct ifreq *req = reinterpret_caststruct ifreq *(ptr);
+ ptr += IFNAMSIZ;
+ ptr += req-ifr_addr.sa_len;
+ if (!strcmp(lo0, req-ifr_name) || !isInetOrInet6(req-ifr_addr))
+continue;
+ char dots[INET6_ADDRSTRLEN];
+if (! ::inet_ntop(req-ifr_addr.sa_family,
InetAddr(req-ifr_addr
svn commit: r1657976 - /qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h
Author: shuston
Date: Fri Feb 6 21:55:36 2015
New Revision: 1657976
URL: http://svn.apache.org/r1657976
Log:
NO-JIRA - fix compile warning 4250 inheritance by dominance on Windows Visual
Studio 2013.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h?rev=1657976r1=1657975r2=1657976view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LossyLvq.h Fri Feb 6 21:55:36 2015
@@ -28,6 +28,12 @@ namespace qpid {
namespace broker {
class MessageMap;
+// Disable inherited-by-dominance warning on MSVC. We know. It's ok.
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4250)
+#endif
+
/**
* Combination of LossyQueue and Lvq behaviours.
*/
@@ -36,6 +42,11 @@ class LossyLvq : public Lvq, public Loss
public:
LossyLvq(const std::string, std::auto_ptrMessageMap, const
QueueSettings, MessageStore* const, management::Manageable*, Broker*);
};
+
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
}} // namespace qpid::broker
#endif /*!QPID_BROKER_LOSSYLVQ_H*/
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1657914 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp
Author: shuston
Date: Fri Feb 6 18:26:15 2015
New Revision: 1657914
URL: http://svn.apache.org/r1657914
Log:
Fix operator bool() to work with Visual Studio 2013
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp?rev=1657914r1=1657913r2=1657914view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Thread.cpp Fri Feb 6 18:26:15 2015
@@ -224,7 +224,7 @@ Thread::Thread(Runnable* runnable) : imp
Thread::Thread(Runnable runnable) :
impl(ThreadPrivate::createThread(runnable)) {}
Thread::operator bool() {
-return impl;
+return !!impl;
}
bool Thread::operator==(const Thread t) const {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1657338 - in /qpid/trunk/qpid/cpp: ./ src/ src/qpid/ src/qpid/amqp/ src/qpid/broker/ src/qpid/broker/amqp/ src/qpid/store/ src/qpid/sys/ src/qpid/sys/FreeBSD/ src/qpid/sys/posix/ src/qpid
Author: shuston
Date: Wed Feb 4 17:37:19 2015
New Revision: 1657338
URL: http://svn.apache.org/r1657338
Log:
Apply patches for QPID-6312 to get Qpid building on AIX with XL C++ 13.1
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/INSTALL
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/InlineAllocator.h
qpid/trunk/qpid/cpp/src/qpid/Options.cpp
qpid/trunk/qpid/cpp/src/qpid/RangeSet.h
qpid/trunk/qpid/cpp/src/qpid/RefCounted.h
qpid/trunk/qpid/cpp/src/qpid/SessionId.h
qpid/trunk/qpid/cpp/src/qpid/amqp/MapEncoder.h
qpid/trunk/qpid/cpp/src/qpid/broker/QueueRegistry.h
qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Filter.h
qpid/trunk/qpid/cpp/src/qpid/store/MessageStorePlugin.h
qpid/trunk/qpid/cpp/src/qpid/sys/FreeBSD/uuid.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/Thread.h
qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/Thread.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/Time.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/unordered_map.h
qpid/trunk/qpid/cpp/src/qpid/types/Variant.cpp
qpid/trunk/qpid/cpp/src/tests/TimerTest.cpp
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1657338r1=1657337r2=1657338view=diff
==
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Wed Feb 4 17:37:19 2015
@@ -182,6 +182,11 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL SunPr
set (HIDE_SYMBOL_FLAGS )
endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+# XL is IBM XL C/C++
+if (CMAKE_CXX_COMPILER_ID MATCHES XL)
+ set (COMPILER_FLAGS -qtls -qrtti)
+endif (CMAKE_CXX_COMPILER_ID MATCHES XL)
+
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
# Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target
version
set (win32_winnt_default OFF)
Modified: qpid/trunk/qpid/cpp/INSTALL
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/INSTALL?rev=1657338r1=1657337r2=1657338view=diff
==
--- qpid/trunk/qpid/cpp/INSTALL (original)
+++ qpid/trunk/qpid/cpp/INSTALL Wed Feb 4 17:37:19 2015
@@ -91,7 +91,7 @@ Or if you have only have a command line
2.1 Building as C++11 (Experimental)
-Currently the Qpoid project uses C++ that conforms to the C++03 standard, as
currently
+Currently the Qpid project uses C++ that conforms to the C++03 standard, as
currently
this is the C++ standard that is supported the most widely, so any new code
must also
compile as C++03. As an experiment (and to support a few extra platforms) the
Qpid code
will also now build as C++11.
@@ -141,6 +141,23 @@ If you want to use the ports version of
Which will allow cmake to find libraries installed in /usr/local (which is
where cyrus-sasl gets
installed by ports).
+2.4 Building on AIX
+===
+Qpid has been tested on AIX 7.1 with XL C++ 13.1 and Boost 1.55.0. The
+thread-using variant of the compiler must be used but it isn't the default
+picked up by cmake. Thus, the compiler must be specified at cmake time.
+For example (assuming PATH includes the compiler binaries):
+
+ # CXX=xlC_r CC=cc_r cmake ..
+
+Warnings from Boost header files are expected and can be ignored.
+
+It is normal to see (lots of) multiply-defined symbol warnings when linking
+the shared libraries built as part of Qpid.
+
+The mktemp package must be installed separately in order to execute the
+Qpid test suite.
+
3. Building a Repository Working Copy
=
To get the source code from the subversion repository (trunk) do:
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1657338r1=1657337r2=1657338view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Feb 4 17:37:19 2015
@@ -42,6 +42,7 @@ include(CheckIncludeFiles)
include(CheckIncludeFileCXX)
include(CheckLibraryExists)
include(CheckSymbolExists)
+include(CheckSizeTNativeType)
find_package(PkgConfig)
find_package(Ruby)
@@ -350,6 +351,8 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windo
mark_as_advanced(QPID_POLLER)
endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
+check_size_t_native_type (QPID_SIZE_T_NATIVE)
+
option(BUILD_SASL Build with Cyrus SASL support ${SASL_FOUND})
if (BUILD_SASL)
if (NOT SASL_FOUND)
@@ -684,6 +687,12 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
)
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ if (CMAKE_SYSTEM_NAME STREQUAL AIX)
+set (qpid_system_module
+ qpid/sys/aix/SystemInfo.cpp
+)
+ endif
svn commit: r1657476 - /qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake
Author: shuston
Date: Thu Feb 5 04:46:38 2015
New Revision: 1657476
URL: http://svn.apache.org/r1657476
Log:
Add cmake module for checking size_t native; should have been with the rest of
the patch for QPID-6312
Added:
qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake
Added: qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake?rev=1657476view=auto
==
--- qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake (added)
+++ qpid/trunk/qpid/cpp/CMakeModules/CheckSizeTNativeType.cmake Thu Feb 5
04:46:38 2015
@@ -0,0 +1,59 @@
+#
+# $Id $
+#
+# Author(s): Anton Deguet
+# Created on: 2011
+#
+# (C) Copyright 2011 Johns Hopkins University (JHU), All Rights
+# Reserved.
+#
+# --- begin cisst license - do not edit ---
+#
+# This software is provided as is under an open source license, with
+# no warranty. The complete license can be found in license.txt and
+# http://www.cisst.org/cisst/license.txt.
+#
+# --- end cisst license ---
+
+function (check_size_t_native_type VARIABLE)
+ # make sure we don't test over and over
+ if (${VARIABLE} MATCHES ^${VARIABLE}$)
+message (STATUS Checking to see if size_t is a native type)
+set (SOURCE
+ #include vector
+ char method(unsigned int p) {
+return 'u';
+ }
+ char method(unsigned long long int p) {
+return 'l';
+ }
+ char method(size_t p) {
+return 's';
+ }
+ int main(void) {})
+
+file (WRITE
+
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test_size_t.cpp
+ ${SOURCE}\n)
+
+try_compile (${VARIABLE}
+ ${CMAKE_BINARY_DIR}
+
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test_size_t.cpp
+ OUTPUT_VARIABLE OUTPUT)
+
+# report using message and log files
+if (${VARIABLE})
+ message (STATUS Checking to see if size_t is a native type - yes)
+ file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+Determining if size_t is a native type passed with
+the following output:\n${OUTPUT}\n\n)
+else (${VARIABLE})
+ message (STATUS Checking to see if size_t is a native type - no)
+ file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+Determining if size_t is a native type passed with
+the following output:\n${OUTPUT}\n\n)
+endif (${VARIABLE})
+
+ endif (${VARIABLE} MATCHES ^${VARIABLE}$)
+
+endfunction (check_size_t_native_type VARIABLE)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[1/2] qpid-proton git commit: AIX has getopt in stdlib
Repository: qpid-proton Updated Branches: refs/heads/master 7d5bf0a69 - 5c6207f6a AIX has getopt in stdlib Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d3c6fb0b Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d3c6fb0b Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d3c6fb0b Branch: refs/heads/master Commit: d3c6fb0ba4443ab607e8a985e03870d8d6a4eec3 Parents: a515e19 Author: Steve Huston shus...@riverace.com Authored: Thu Jan 29 20:35:44 2015 -0500 Committer: Steve Huston shus...@riverace.com Committed: Thu Jan 29 20:35:44 2015 -0500 -- examples/include/pncompat/misc_defs.h | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d3c6fb0b/examples/include/pncompat/misc_defs.h -- diff --git a/examples/include/pncompat/misc_defs.h b/examples/include/pncompat/misc_defs.h index 1c01756..90b0d4e 100644 --- a/examples/include/pncompat/misc_defs.h +++ b/examples/include/pncompat/misc_defs.h @@ -37,10 +37,12 @@ #include proton/types.h -#if !defined(_WIN32) || defined (__CYGWIN__) -#include getopt.h +#if defined(__IBMC__) +# include stdlib.h +#elif !defined(_WIN32) || defined (__CYGWIN__) +# include getopt.h #else -#include internal/getopt.h +# include internal/getopt.h #endif pn_timestamp_t time_now(void); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[2/2] qpid-proton git commit: Merge branch 'PROTON-809'
Merge branch 'PROTON-809' Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5c6207f6 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5c6207f6 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5c6207f6 Branch: refs/heads/master Commit: 5c6207f6ac673af3922975cb5f2669a29ff96ebb Parents: 7d5bf0a d3c6fb0 Author: Steve Huston shus...@riverace.com Authored: Fri Jan 30 15:38:28 2015 -0500 Committer: Steve Huston shus...@riverace.com Committed: Fri Jan 30 15:38:28 2015 -0500 -- examples/include/pncompat/misc_defs.h | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1584055 - /qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake
Author: shuston
Date: Wed Apr 2 14:33:10 2014
New Revision: 1584055
URL: http://svn.apache.org/r1584055
Log:
Change CMake version check from 2.8.0 to 2.8.3 per QPID-5646
Modified:
qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake
Modified: qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake?rev=1584055r1=1584054r2=1584055view=diff
==
--- qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake (original)
+++ qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake Wed Apr 2 14:33:10 2014
@@ -65,6 +65,6 @@ if (PKG_CONFIG_FOUND)
endif()
# Proton not found print a standard error message
-if (NOT ${CMAKE_VERSION} VERSION_LESS 2.8.0)
+if (NOT ${CMAKE_VERSION} VERSION_LESS 2.8.3)
find_package_handle_standard_args(Proton CONFIG_MODE)
endif()
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1584066 - /qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
Author: shuston
Date: Wed Apr 2 15:16:08 2014
New Revision: 1584066
URL: http://svn.apache.org/r1584066
Log:
Merge QPID-5646 fix r1584055 to 0.28
Modified:
qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake (contents,
props changed)
Modified: qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
URL:
http://svn.apache.org/viewvc/qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake?rev=1584066r1=1584065r2=1584066view=diff
==
--- qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake (original)
+++ qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake Wed Apr 2
15:16:08 2014
@@ -65,6 +65,6 @@ if (PKG_CONFIG_FOUND)
endif()
# Proton not found print a standard error message
-if (NOT ${CMAKE_VERSION} VERSION_LESS 2.8.0)
+if (NOT ${CMAKE_VERSION} VERSION_LESS 2.8.3)
find_package_handle_standard_args(Proton CONFIG_MODE)
endif()
Propchange: qpid/branches/0.28/qpid/cpp/CMakeModules/FindProton.cmake
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 2 15:16:08 2014
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/CMakeModules/FindProton.cmake:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/CMakeModules/FindProton.cmake:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/CMakeModules/FindProton.cmake:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/CMakeModules/FindProton.cmake:805429-825319
+/qpid/branches/mcpierce-QPID-4719/qpid/cpp/CMakeModules/FindProton.cmake:1477004-1477093
+/qpid/branches/qpid-2935/qpid/cpp/CMakeModules/FindProton.cmake:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/CMakeModules/FindProton.cmake:1144319-1179855
+/qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake:1579926,1580559-1580560,1584055
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1509969 - /qpid/trunk/qpid/packaging/windows/qpidc.wxs
Author: shuston Date: Sat Aug 3 12:26:47 2013 New Revision: 1509969 URL: http://svn.apache.org/r1509969 Log: QPID-5031: Remove deprecated Action modifier. Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/qpidc.wxs?rev=1509969r1=1509968r2=1509969view=diff == --- qpid/trunk/qpid/packaging/windows/qpidc.wxs (original) +++ qpid/trunk/qpid/packaging/windows/qpidc.wxs Sat Aug 3 12:26:47 2013 @@ -96,8 +96,7 @@ !-- This registry key, values, procedure, and reasoning are described at http://support.microsoft.com/kb/817066 It's necessary for the WCF XA support to work properly. -- -RegistryKey Root=HKLM Key=SOFTWARE\Microsoft\MSDTC\XADLL - Action=create +RegistryKey Root=HKLM Key=SOFTWARE\Microsoft\MSDTC\XADLL RegistryValue Type=string Name=qpidxarm.dll Value=[QpidBin]qpidxarm.dll / - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1502669 - in /qpid/trunk/qpid/cpp: INSTALL INSTALL-WINDOWS
Author: shuston Date: Fri Jul 12 20:23:43 2013 New Revision: 1502669 URL: http://svn.apache.org/r1502669 Log: Warn that python 3.x and ruby 2.x do not work. Related to QPID-4982. Modified: qpid/trunk/qpid/cpp/INSTALL qpid/trunk/qpid/cpp/INSTALL-WINDOWS Modified: qpid/trunk/qpid/cpp/INSTALL URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/INSTALL?rev=1502669r1=1502668r2=1502669view=diff == --- qpid/trunk/qpid/cpp/INSTALL (original) +++ qpid/trunk/qpid/cpp/INSTALL Fri Jul 12 20:23:43 2013 @@ -150,10 +150,13 @@ all of the above plus: * doxygenftp://ftp.stack.nl/pub/users/dimitri/ (1.5.1) * graphviz http://www.graphviz.org/ (2.12) * ruby 1.8 http://www.ruby-lang.org (1.8.4) - + * python 2.x http://www.python.org (2.4.3) NOTE: make sure to install the related '-devel' packages also +NOTE: Python 3.x is know to NOT work - please use 2.7 or earlier. +Ruby should be prior to version 2. + To build the QMF (Qpid Management Framework) bindings for Ruby and Python, the following must also be installed: Modified: qpid/trunk/qpid/cpp/INSTALL-WINDOWS URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/INSTALL-WINDOWS?rev=1502669r1=1502668r2=1502669view=diff == --- qpid/trunk/qpid/cpp/INSTALL-WINDOWS (original) +++ qpid/trunk/qpid/cpp/INSTALL-WINDOWS Fri Jul 12 20:23:43 2013 @@ -41,9 +41,7 @@ Take these as a recommended minimum vers The following libraries and header files must be installed to build from either a source checkout or a source distribution: - * boost http://www.boost.org (1.35)(*) - -earlier versions of boost e.g. 1.33 also work + * boost http://www.boost.org (1.35) To build from a source repository (SVN) checkout you will need boost plus: @@ -51,6 +49,9 @@ To build from a source repository (SVN) * python http://www.python.org (2.5.2) * ruby http://www.ruby-lang.org (1.8.4) +NOTE: Python 3.x is known to NOT work - please use 2.7 or earlier. +Ruby should be prior to version 2. + Regardless of which type of build you perform, if you wish to run the full test suite, you will need to have python, listed above, installed. - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1502714 - /qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1
Author: shuston
Date: Fri Jul 12 22:25:21 2013
New Revision: 1502714
URL: http://svn.apache.org/r1502714
Log:
Add Windows Powershell version of this test. NO-JIRA.
Added:
qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1
Added: qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1?rev=1502714view=auto
==
--- qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1 (added)
+++ qpid/trunk/qpid/cpp/src/tests/run_msg_group_tests.ps1 Fri Jul 12 22:25:21
2013
@@ -0,0 +1,71 @@
+#
+# 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.
+#
+
+# Simple test of encode/decode of a double in application headers
+# TODO: this should be expanded to cover a wider set of types and go
+# in both directions
+
+$srcdir = Split-Path $myInvocation.InvocationName
+$PYTHON_DIR = $srcdir\..\..\..\python
+if (!(Test-Path $PYTHON_DIR -pathType Container)) {
+Skipping msg_group test as python libs not found
+exit 0
+}
+
+. .\test_env.ps1
+
+if (Test-Path qpidd.port) {
+ set-item -path env:QPID_PORT -value (get-content -path qpidd.port
-totalcount 1)
+}
+
+# Test runs from the tests directory but the test executables are in a
+# subdirectory based on the build type. Look around for it before trying
+# to start it.
+. $srcdir\find_prog.ps1 .\msg_group_test.exe
+if (!(Test-Path $prog)) {
+Cannot locate msg_group_test.exe
+exit 1
+}
+
+$QUEUE_NAME=group-queue
+$GROUP_KEY=My-Group-Id
+$BROKER_URL=localhost:$env:QPID_PORT
+
+$tests=@(python $QPID_CONFIG_EXEC -b $BROKER_URL add queue $QUEUE_NAME
--group-header=${GROUP_KEY} --shared-groups,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 103
--group-size 13 --receivers 2 --senders 3 --capacity 3 --ack-frequency 7
--randomize-group-size --interleave 3,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 103
--group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 7
--randomize-group-size,
+python $QPID_CONFIG_EXEC -b $BROKER_URL add queue ${QUEUE_NAME}-two
--group-header=${GROUP_KEY} --shared-groups,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 103
--group-size 13 --receivers 2 --senders 3 --capacity 7 --ack-frequency 3
--randomize-group-size,
+$prog -b $BROKER_URL -a ${QUEUE_NAME}-two --group-key $GROUP_KEY
--messages 103 --group-size 13 --receivers 2 --senders 3 --capacity 3
--ack-frequency 7 --randomize-group-size --interleave 5,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 59
--group-size 5 --receivers 2 --senders 3 --capacity 1 --ack-frequency 3
--randomize-group-size,
+python $QPID_CONFIG_EXEC -b $BROKER_URL del queue ${QUEUE_NAME}-two
--force,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 59
--group-size 3 --receivers 2 --senders 3 --capacity 1 --ack-frequency 1
--randomize-group-size,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages 211
--group-size 13 --receivers 2 --senders 3 --capacity 47 --ack-frequency 79
--interleave 53,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages
1 --group-size 1 --receivers 0 --senders 1,
+$prog -b $BROKER_URL -a $QUEUE_NAME --group-key $GROUP_KEY --messages
1 --receivers 5 --senders 0,
+python $QPID_CONFIG_EXEC -b $BROKER_URL del queue $QUEUE_NAME --force)
+
+foreach ($cmd in $tests)
+{
+ Invoke-Expression $cmd | Write-Output
+ $ret = $LASTEXITCODE
+ if ($ret -ne 0) {Write-Host FAILED message group test. Failed command: $cmd
+break}
+}
+exit $ret
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1502090 - /qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
Author: shuston
Date: Thu Jul 11 02:49:42 2013
New Revision: 1502090
URL: http://svn.apache.org/r1502090
Log:
Fix MSVC compile warning struct vs. class. NO-JIRA.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=1502090r1=1502089r2=1502090view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Thu Jul 11 02:49:42 2013
@@ -39,7 +39,7 @@
namespace qpid {
namespace amqp {
class MapHandler;
-class MessageId;
+struct MessageId;
}
namespace management {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1495271 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt
Author: shuston
Date: Fri Jun 21 01:55:19 2013
New Revision: 1495271
URL: http://svn.apache.org/r1495271
Log:
Fix broken Windows configure; QPID-4938 change 19-June-2013 broke it.
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1495271r1=1495270r2=1495271view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Jun 21 01:55:19 2013
@@ -1060,13 +1060,17 @@ add_library (qpidcommon SHARED ${qpidcom
if (CLOCK_GETTIME_IN_RT)
set (qpidcommon_platform_LIBS ${qpidcommon_platform_LIBS} rt)
endif (CLOCK_GETTIME_IN_RT)
+# Not all platforms have NSS_LINK_FLAGS
+if (NSS_LINK_FLAGS)
+ set (qpidcommon_LINK_FLAGS LINK_FLAGS ${NSS_LINK_FLAGS})
+endif (NSS_LINK_FLAGS)
target_link_libraries (qpidcommon qpidtypes
${qpidcommon_platform_LIBS}
${qpidcommon_sasl_lib})
set_target_properties (qpidcommon PROPERTIES
VERSION ${qpidcommon_version}
SOVERSION ${qpidcommon_version_major}
- LINK_FLAGS ${NSS_LINK_FLAGS})
+ ${qpidcommon_LINK_FLAGS})
install (TARGETS qpidcommon
DESTINATION ${QPID_INSTALL_LIBDIR}
COMPONENT ${QPID_COMPONENT_COMMON})
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1490856 - /qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp
Author: shuston
Date: Fri Jun 7 22:38:17 2013
New Revision: 1490856
URL: http://svn.apache.org/r1490856
Log:
Fix compile warning on Visual Studio. NO-JIRA.
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp?rev=1490856r1=1490855r2=1490856view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/StatusCheck.cpp Fri Jun 7 22:38:17 2013
@@ -100,11 +100,11 @@ void StatusCheckThread::run() {
QPID_LOG(info, statusCheck.logPrefix Checking status of url
: error.what());
}
try { c.close(); }
-catch(const exception e) {
+catch(const exception) {
QPID_LOG(warning, statusCheck.logPrefix Error closing status check
connection to url);
}
try { c.close(); }
-catch(const exception e) {
+catch(const exception) {
QPID_LOG(warning, Error closing status check connection to url);
}
delete this;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1490363 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt qmf/Agent.cpp qmf/AgentSession.cpp qpid/messaging/AddressParser.h
Author: shuston
Date: Thu Jun 6 17:17:05 2013
New Revision: 1490363
URL: http://svn.apache.org/r1490363
Log:
Allows QMF to build on Windows; resolves QPID-4909.
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/AddressParser.h
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1490363r1=1490362r2=1490363view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Jun 6 17:17:05 2013
@@ -1322,7 +1322,16 @@ install (FILES ${qmf_HEADERS}
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf ${QPID_COMPONENT_QMF})
-if(NOT WIN32)
+if (NOT WIN32)
+set (qmf2_platform_headers
+../include/qmf/posix/EventNotifier.h
+)
+set (qmf2_platform_sources
+qmf/PosixEventNotifier.cpp
+qmf/PosixEventNotifierImpl.cpp
+)
+endif (NOT WIN32)
+
set (qmf2_HEADERS
../include/qmf/AgentEvent.h
../include/qmf/Agent.h
@@ -1334,7 +1343,6 @@ if(NOT WIN32)
../include/qmf/exceptions.h
../include/qmf/Handle.h
../include/qmf/ImportExport.h
-../include/qmf/posix/EventNotifier.h
../include/qmf/Query.h
../include/qmf/Schema.h
../include/qmf/SchemaId.h
@@ -1342,6 +1350,7 @@ if(NOT WIN32)
../include/qmf/SchemaProperty.h
../include/qmf/SchemaTypes.h
../include/qmf/Subscription.h
+${qmf2_platform_headers}
)
set (qmf2_SOURCES
@@ -1366,8 +1375,6 @@ if(NOT WIN32)
qmf/DataImpl.h
qmf/EventNotifierImpl.h
qmf/EventNotifierImpl.cpp
-qmf/PosixEventNotifier.cpp
-qmf/PosixEventNotifierImpl.cpp
qmf/exceptions.cpp
qmf/Expression.cpp
qmf/Expression.h
@@ -1388,6 +1395,7 @@ if(NOT WIN32)
qmf/SchemaPropertyImpl.h
qmf/Subscription.cpp
qmf/SubscriptionImpl.h
+${qmf2_platform_sources}
)
add_msvc_version (qmf2 library dll)
@@ -1403,7 +1411,6 @@ if(NOT WIN32)
DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf
COMPONENT ${QPID_COMPONENT_QMF})
install_pdb (qmf2 ${QPID_COMPONENT_QMF})
-endif (NOT WIN32)
set (qmfengine_SOURCES
qmf/engine/Agent.cpp
Modified: qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Agent.cpp?rev=1490363r1=1490362r2=1490363view=diff
==
--- qpid/trunk/qpid/cpp/src/qmf/Agent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Agent.cpp Thu Jun 6 17:17:05 2013
@@ -220,7 +220,7 @@ uint32_t AgentImpl::getPackageCount() co
//
// Populate the package set.
//
-for (setSchemaId::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++)
+for (setSchemaId, SchemaIdCompare::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++)
packageSet.insert(iter-getPackageName());
return packageSet.size();
@@ -244,7 +244,7 @@ uint32_t AgentImpl::getSchemaIdCount(con
{
qpid::sys::Mutex::ScopedLock l(lock);
uint32_t count(0);
-for (setSchemaId::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++)
+for (setSchemaId, SchemaIdCompare::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++)
if (iter-getPackageName() == pname)
count++;
return count;
@@ -255,7 +255,7 @@ SchemaId AgentImpl::getSchemaId(const st
{
qpid::sys::Mutex::ScopedLock l(lock);
uint32_t count(0);
-for (setSchemaId::const_iterator iter = schemaIdSet.begin(); iter !=
schemaIdSet.end(); iter++) {
+for (setSchemaId, SchemaIdCompare::const_iterator iter =
schemaIdSet.begin(); iter != schemaIdSet.end(); iter++) {
if (iter-getPackageName() == pname) {
if (idx == count)
return *iter;
Modified: qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp?rev=1490363r1=1490362r2=1490363view=diff
==
--- qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/AgentSession.cpp Thu Jun 6 17:17:05 2013
@@ -375,7 +375,7 @@ void AgentSessionImpl::authAccept(AgentE
if (query.getSchemaId().isValid()) {
{
qpid::sys::Mutex::ScopedLock l(lock);
-mapSchemaId, DataIndex::const_iterator iter =
schemaIndex.find(query.getSchemaId());
+mapSchemaId, DataIndex, SchemaIdCompareNoHash::const_iterator
iter = schemaIndex.find(query.getSchemaId());
if (iter != schemaIndex.end
svn commit: r1490365 - /qpid/trunk/qpid/cpp/src/tests/store.py
Author: shuston Date: Thu Jun 6 17:22:33 2013 New Revision: 1490365 URL: http://svn.apache.org/r1490365 Log: Add a test for recovering a message with 0-length body. NO-JIRA. Modified: qpid/trunk/qpid/cpp/src/tests/store.py Modified: qpid/trunk/qpid/cpp/src/tests/store.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/store.py?rev=1490365r1=1490364r2=1490365view=diff == --- qpid/trunk/qpid/cpp/src/tests/store.py (original) +++ qpid/trunk/qpid/cpp/src/tests/store.py Thu Jun 6 17:22:33 2013 @@ -127,6 +127,12 @@ class StoreTests(BrokerTest): self.ssn.exchange_declare(exchange=DB_E1, type=direct, durable=True) self.ssn.exchange_bind(exchange=DB_E1, queue=DB_Q1, binding_key=K1) +# Queue up 2 messages, one with non-zero body, one with zero-length. +# 2 = delivery_mode.persistent +dp = self.ssn.delivery_properties(routing_key=DB_Q1, delivery_mode=2) +self.ssn.message_transfer(message=Message(dp, normal message)) +self.ssn.message_transfer(message=Message(dp, )) + # Cycle the broker and make sure the binding recovers self.cycle_broker() response = self.ssn.exchange_bound(exchange=DB_E1, queue=DB_Q1, binding_key=K1) @@ -135,6 +141,17 @@ class StoreTests(BrokerTest): self.assert_(not response.queue_not_matched) self.assert_(not response.key_not_matched) +# Are the messages still there? +self.ssn.message_subscribe(destination=msgs, queue=DB_Q1, accept_mode=1, acquire_mode=0) +self.ssn.message_flow(unit = 1, value = 0xL, destination = msgs) +self.ssn.message_flow(unit = 0, value = 10, destination = msgs) +message_arrivals = self.ssn.incoming(msgs) +try: + message_arrivals.get(timeout=1) + message_arrivals.get(timeout=1) +except Empty: + assert False, 'Durable message(s) not recovered' + self.ssn.exchange_unbind(queue=DB_Q1, exchange=DB_E1, binding_key=K1) self.ssn.exchange_delete(exchange=DB_E1) self.ssn.queue_delete(queue=DB_Q1) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1438776 - in /qpid/trunk/qpid/cpp/src/qpid/ha: Role.h StandAlone.h
Author: shuston
Date: Fri Jan 25 23:53:30 2013
New Revision: 1438776
URL: http://svn.apache.org/viewvc?rev=1438776view=rev
Log:
Refer to Url consistently as a struct, not a class. Removes warning on MSVC.
NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/qpid/ha/Role.h
qpid/trunk/qpid/cpp/src/qpid/ha/StandAlone.h
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Role.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Role.h?rev=1438776r1=1438775r2=1438776view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/ha/Role.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Role.h Fri Jan 25 23:53:30 2013
@@ -25,7 +25,7 @@
#include string
namespace qpid {
-class Url;
+struct Url;
namespace ha {
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/StandAlone.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/StandAlone.h?rev=1438776r1=1438775r2=1438776view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/ha/StandAlone.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/StandAlone.h Fri Jan 25 23:53:30 2013
@@ -22,7 +22,7 @@
*
*/
namespace qpid {
-class Url;
+struct Url;
namespace ha {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1437812 - /qpid/trunk/qpid/packaging/windows/qpidc.wxs
Author: shuston Date: Thu Jan 24 00:35:00 2013 New Revision: 1437812 URL: http://svn.apache.org/viewvc?rev=1437812view=rev Log: Obtain ProgramFiles location correctly on 32 and 64 bit systems. Fixes QPID-4548 Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/qpidc.wxs?rev=1437812r1=1437811r2=1437812view=diff == --- qpid/trunk/qpid/packaging/windows/qpidc.wxs (original) +++ qpid/trunk/qpid/packaging/windows/qpidc.wxs Thu Jan 24 00:35:00 2013 @@ -42,11 +42,18 @@ PropertyRef Id=NETFRAMEWORK35/ !-- Allow 64-bit builds to pick ProgramFiles64Folder instead -- -?Define ProgramFiles = ProgramFilesFolder? +?define ProgramFiles = ProgramFilesFolder? + +!-- Pick up Program Files for 32-bit from the correct place -- +?ifdef env.ProgramFiles(x86)? + ?define ProgramFilesx86 = $(env.ProgramFiles(x86))? +?else? + ?define ProgramFilesx86 = $(env.ProgramFiles)? +?endif? Directory Id=TARGETDIR Name=SourceDir - Merge Id=VCRedist SourceFile=C:\Program Files\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm DiskId=1 Language=0/ - Merge Id=VCRedistPolicy SourceFile=C:\Program Files\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm DiskId=1 Language=0/ + Merge Id=VCRedist SourceFile=$(var.ProgramFilesx86)\Common Files\Merge Modules\Microsoft_VC90_CRT_x86.msm DiskId=1 Language=0/ + Merge Id=VCRedistPolicy SourceFile=$(var.ProgramFilesx86)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_x86.msm DiskId=1 Language=0/ Directory Id=$(var.ProgramFiles) Directory Id=ApacheTop Name=Apache Directory Id=INSTALLLOCATION Name=qpidc-$(var.qpidc_version) @@ -269,7 +276,6 @@ ComponentRef Id=TopStorePlugin/ ComponentRef Id=SQLPersistence/ ComponentRef Id=CLFSPersistence/ - ComponentGroupRef Id=group_BoostDlls/ /Feature Feature Id=ClientLib Title=Client Libraries and Headers to develop and run programs Level=1 @@ -293,8 +299,6 @@ ComponentRef Id=WCFInteropDLL/ ComponentRef Id=WCFXADLL/ ComponentGroupRef Id=group_QpidHeaders/ - ComponentGroupRef Id=group_BoostHeaders/ -ComponentGroupRef Id=group_BoostDlls/ Feature Id=Examples Title=Client Programming Examples Level=1 ComponentGroupRef Id=group_Examples/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1428100 - /qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp
Author: shuston Date: Wed Jan 2 22:51:39 2013 New Revision: 1428100 URL: http://svn.apache.org/viewvc?rev=1428100view=rev Log: NO-JIRA - add newline at end of file Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp?rev=1428100r1=1428099r2=1428100view=diff == --- qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.cpp Wed Jan 2 22:51:39 2013 @@ -35,4 +35,4 @@ void ConnectionState::setUserId(const st getBroker().getOptions().realm == userId.substr(at+1,userId.size())); } -}} \ No newline at end of file +}} - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1428104 - /qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
Author: shuston
Date: Wed Jan 2 23:12:40 2013
New Revision: 1428104
URL: http://svn.apache.org/viewvc?rev=1428104view=rev
Log:
NO-JIRA - refer to DtxTimeout as the struct it is, not a class. Avoids a VC
diagnostic.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h?rev=1428104r1=1428103r2=1428104view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.h Wed Jan 2 23:12:40 2013
@@ -37,7 +37,7 @@
namespace qpid {
namespace broker {
-class DtxTimeout;
+struct DtxTimeout;
/**
* Represents the work done under a particular distributed transaction
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1415470 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt
Author: shuston
Date: Fri Nov 30 01:03:32 2012
New Revision: 1415470
URL: http://svn.apache.org/viewvc?rev=1415470view=rev
Log:
QPID-4484 Add -Wno-attributes to gcc 4.1.2 command line
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1415470r1=1415469r2=1415470view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Nov 30 01:03:32 2012
@@ -277,7 +277,15 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set (CATCH_UNDEFINED )
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
set (COMPILER_FLAGS -fvisibility-inlines-hidden)
- set (HIDE_SYMBOL_FLAGS -fvisibility=hidden)
+ # gcc 4.1.2 on RHEL 5 needs -Wno-attributes to avoid an error that's fixed
+ # in later gcc versions.
+ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+ OUTPUT_VARIABLE GCC_VERSION)
+ if (GCC_VERSION VERSION_EQUAL 4.1.2)
+ set (HIDE_SYMBOL_FLAGS -fvisibility=hidden -Wno-attributes)
+ else (GCC_VERSION VERSION_EQUAL 4.1.2)
+ set (HIDE_SYMBOL_FLAGS -fvisibility=hidden)
+ endif (GCC_VERSION VERSION_EQUAL 4.1.2)
endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1414918 - /qpid/trunk/qpid/cpp/etc/CMakeLists.txt
Author: shuston
Date: Wed Nov 28 21:10:14 2012
New Revision: 1414918
URL: http://svn.apache.org/viewvc?rev=1414918view=rev
Log:
NO-JIRA only try to install qpidd.service on UNIX.
Modified:
qpid/trunk/qpid/cpp/etc/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/etc/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/etc/CMakeLists.txt?rev=1414918r1=1414917r2=1414918view=diff
==
--- qpid/trunk/qpid/cpp/etc/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/etc/CMakeLists.txt Wed Nov 28 21:10:14 2012
@@ -23,9 +23,11 @@ install(FILES qpidc.conf
install(FILES qpidd.conf
DESTINATION ${QPID_INSTALL_CONFDIR}
COMPONENT ${QPID_COMPONENT_BROKER})
-install(FILES qpidd.service
-DESTINATION ${QPID_INSTALL_SYSTEMDDIR}
-COMPONENT ${QPID_COMPONENT_BROKER})
+if (UNIX)
+ install(FILES qpidd.service
+ DESTINATION ${QPID_INSTALL_SYSTEMDDIR}
+ COMPONENT ${QPID_COMPONENT_BROKER})
+endif (UNIX)
if (BUILD_SASL)
install(FILES sasl2/qpidd.conf
DESTINATION ${QPID_INSTALL_SASLDIR}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1413889 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
Author: shuston
Date: Mon Nov 26 22:02:07 2012
New Revision: 1413889
URL: http://svn.apache.org/viewvc?rev=1413889view=rev
Log:
Prevent multiple threads from dispatching the condition handling at once. Fixes
QPID-4424.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp?rev=1413889r1=1413888r2=1413889view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp Mon Nov 26
22:02:07 2012
@@ -52,13 +52,14 @@ private:
PollableCondition parent;
boost::shared_ptrsys::Poller poller;
LONG isSet;
+LONG isDispatching;
};
PollableConditionPrivate::PollableConditionPrivate(const
sys::PollableCondition::Callback cb,
sys::PollableCondition
parent,
const
boost::shared_ptrsys::Poller poller)
: IOHandle(INVALID_SOCKET, boost::bind(PollableConditionPrivate::dispatch,
this, _1)),
-cb(cb), parent(parent), poller(poller), isSet(0)
+cb(cb), parent(parent), poller(poller), isSet(0), isDispatching(0)
{
}
@@ -77,7 +78,12 @@ void PollableConditionPrivate::poke()
void PollableConditionPrivate::dispatch(windows::AsynchIoResult *result)
{
delete result; // Poller::monitorHandle() allocates this
+// If isDispatching is already set, just return. Else, enter.
+if (::InterlockedCompareExchange(isDispatching, 1, 0) == 1)
+return;
cb(parent);
+LONG oops = ::InterlockedDecrement(isDispatching); // Result must be 0
+assert(!oops);
if (isSet)
poke();
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1413945 - /qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
Author: shuston
Date: Mon Nov 26 23:57:08 2012
New Revision: 1413945
URL: http://svn.apache.org/viewvc?rev=1413945view=rev
Log:
Merge QPID-4424 fix to 0.20.
Modified:
qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
(contents, props changed)
Modified: qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp?rev=1413945r1=1413944r2=1413945view=diff
==
--- qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
(original)
+++ qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp Mon
Nov 26 23:57:08 2012
@@ -52,13 +52,14 @@ private:
PollableCondition parent;
boost::shared_ptrsys::Poller poller;
LONG isSet;
+LONG isDispatching;
};
PollableConditionPrivate::PollableConditionPrivate(const
sys::PollableCondition::Callback cb,
sys::PollableCondition
parent,
const
boost::shared_ptrsys::Poller poller)
: IOHandle(INVALID_SOCKET, boost::bind(PollableConditionPrivate::dispatch,
this, _1)),
-cb(cb), parent(parent), poller(poller), isSet(0)
+cb(cb), parent(parent), poller(poller), isSet(0), isDispatching(0)
{
}
@@ -77,7 +78,12 @@ void PollableConditionPrivate::poke()
void PollableConditionPrivate::dispatch(windows::AsynchIoResult *result)
{
delete result; // Poller::monitorHandle() allocates this
+// If isDispatching is already set, just return. Else, enter.
+if (::InterlockedCompareExchange(isDispatching, 1, 0) == 1)
+return;
cb(parent);
+LONG oops = ::InterlockedDecrement(isDispatching); // Result must be 0
+assert(!oops);
if (isSet)
poke();
}
Propchange:
qpid/branches/0.20/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 26 23:57:08 2012
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/sys/windows/PollableCondition.cpp:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/sys/windows/PollableCondition.cpp:1072051-1079078
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp:1413889
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1405106 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt
Author: shuston
Date: Fri Nov 2 19:09:21 2012
New Revision: 1405106
URL: http://svn.apache.org/viewvc?rev=1405106view=rev
Log:
Put pkgconfig files in right place. Fixes QPID-4413.
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1405106r1=1405105r2=1405106view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Nov 2 19:09:21 2012
@@ -1484,8 +1484,8 @@ set (VERSION ${QPID_VERSION})
#add_custom_target(pkgconfig ALL echo DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/qpid.pc)
#add_dependencies(pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
-configure_file(qpid.pc.in qpid.pc @ONLY)
-configure_file(qmf2.pc.in qmf2.pc @ONLY)
+configure_file(qpid.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc @ONLY)
+configure_file(qmf2.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc @ONLY)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc
${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
COMPONENT ${QPID_COMPONENT_COMMON})
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1404396 - /qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Author: shuston
Date: Wed Oct 31 22:30:42 2012
New Revision: 1404396
URL: http://svn.apache.org/viewvc?rev=1404396view=rev
Log:
Refer to sessionreceiver project in correct place. Fixes QPID-4406.
Modified:
qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Modified:
qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln?rev=1404396r1=1404395r2=1404396view=diff
==
---
qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
(original)
+++
qpid/branches/0.18/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Wed Oct 31 22:30:42 2012
@@ -21,7 +21,7 @@ Microsoft Visual Studio Solution File, F
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) =
Org.Apache.Qpid.Messaging, ..\src\msvc9\org.apache.qpid.messaging.vcproj,
{AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProject
-Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\msvc9\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1404402 - /qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Author: shuston
Date: Wed Oct 31 22:51:58 2012
New Revision: 1404402
URL: http://svn.apache.org/viewvc?rev=1404402view=rev
Log:
Refer to sessionreceiver project in correct place. Fixes QPID-4406.
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln?rev=1404402r1=1404401r2=1404402view=diff
==
---
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
(original)
+++
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Wed Oct 31 22:51:58 2012
@@ -21,7 +21,7 @@ Microsoft Visual Studio Solution File, F
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) =
Org.Apache.Qpid.Messaging, ..\src\msvc9\org.apache.qpid.messaging.vcproj,
{AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProject
-Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\msvc9\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1399838 - /qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
Author: shuston
Date: Thu Oct 18 20:39:51 2012
New Revision: 1399838
URL: http://svn.apache.org/viewvc?rev=1399838view=rev
Log:
Fix recovering a zero-length message. Fixes QPID-3491.
Modified:
qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp?rev=1399838r1=1399837r2=1399838view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp Thu Oct 18
20:39:51 2012
@@ -147,7 +147,7 @@ MessageRecordset::recover(qpid::broker::
// Now, do we need the rest of the content?
long contentLength = blobSize - headerFieldLength - headerSize;
-if (msg-loadContent(contentLength)) {
+if (contentLength 0 msg-loadContent(contentLength)) {
BlobAdapter content(contentLength);
content =
rs-Fields-Item[fieldTableBlob]-GetChunk(contentLength);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1383225 - /qpid/branches/0.18/qpid/packaging/windows/installer.proj
Author: shuston Date: Tue Sep 11 02:20:36 2012 New Revision: 1383225 URL: http://svn.apache.org/viewvc?rev=1383225view=rev Log: Look for dotnet example files in the correct place for vc9. Fixes QPID-4294 Modified: qpid/branches/0.18/qpid/packaging/windows/installer.proj Modified: qpid/branches/0.18/qpid/packaging/windows/installer.proj URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/packaging/windows/installer.proj?rev=1383225r1=1383224r2=1383225view=diff == --- qpid/branches/0.18/qpid/packaging/windows/installer.proj (original) +++ qpid/branches/0.18/qpid/packaging/windows/installer.proj Tue Sep 11 02:20:36 2012 @@ -36,7 +36,7 @@ OutputNameqpidc/OutputName OutputTypePackage/OutputType WixToolPathC:\Program Files (x86)\Windows Installer XML v3.5\bin/WixToolPath -WixTargetsPath Condition= '$(WixTargetsPath)' == '' $(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\wix.targets/WixTargetsPath +WixTargetsPath Condition= '$(WixTargetsPath)' == '' $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.targets/WixTargetsPath /PropertyGroup Choose @@ -175,10 +175,10 @@ Target Name=BuildDotNetBindings!-- DependsOnTargets=BuildCpp;BuildCppDebug -- MSBuild - Projects=$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln + Projects=$(source_root)\cpp\bindings\qpid\dotnet\msvc9\org.apache.qpid.messaging.sessionreceiver.sln Properties=Configuration=Debug;Platform=$(Architecture) / MSBuild - Projects=$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln + Projects=$(source_root)\cpp\bindings\qpid\dotnet\msvc9\org.apache.qpid.messaging.sessionreceiver.sln Properties=Configuration=Release;Platform=$(Architecture) / /Target - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1383226 - /qpid/trunk/qpid/packaging/windows/installer.proj
Author: shuston Date: Tue Sep 11 02:28:31 2012 New Revision: 1383226 URL: http://svn.apache.org/viewvc?rev=1383226view=rev Log: Look for dotnet example files in the correct place for vc9. Fixes QPID-4294 Modified: qpid/trunk/qpid/packaging/windows/installer.proj (contents, props changed) Modified: qpid/trunk/qpid/packaging/windows/installer.proj URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1383226r1=1383225r2=1383226view=diff == --- qpid/trunk/qpid/packaging/windows/installer.proj (original) +++ qpid/trunk/qpid/packaging/windows/installer.proj Tue Sep 11 02:28:31 2012 @@ -36,7 +36,7 @@ OutputNameqpidc/OutputName OutputTypePackage/OutputType WixToolPathC:\Program Files (x86)\Windows Installer XML v3.5\bin/WixToolPath -WixTargetsPath Condition= '$(WixTargetsPath)' == '' $(MSBuildExtensionsPath)\Microsoft\WiX\v3.5\wix.targets/WixTargetsPath +WixTargetsPath Condition= '$(WixTargetsPath)' == '' $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\wix.targets/WixTargetsPath /PropertyGroup Choose @@ -175,10 +175,10 @@ Target Name=BuildDotNetBindings!-- DependsOnTargets=BuildCpp;BuildCppDebug -- MSBuild - Projects=$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln + Projects=$(source_root)\cpp\bindings\qpid\dotnet\msvc9\org.apache.qpid.messaging.sessionreceiver.sln Properties=Configuration=Debug;Platform=$(Architecture) / MSBuild - Projects=$(source_root)\cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sessionreceiver.sln + Projects=$(source_root)\cpp\bindings\qpid\dotnet\msvc9\org.apache.qpid.messaging.sessionreceiver.sln Properties=Configuration=Release;Platform=$(Architecture) / /Target Propchange: qpid/trunk/qpid/packaging/windows/installer.proj -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Sep 11 02:28:31 2012 @@ -0,0 +1,7 @@ +/qpid/branches/0.10/qpid/packaging/windows/installer.proj:1103083 +/qpid/branches/0.18/qpid/packaging/windows/installer.proj:1383225 +/qpid/branches/0.5.x-dev/qpid/packaging/windows/installer.proj:892761,894875 +/qpid/branches/0.6-release-windows-installer/packaging/windows/installer.proj:926803 +/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows/installer.proj:926865,927233 +/qpid/branches/java-network-refactor/qpid/packaging/windows/installer.proj:805429-825319 +/qpid/branches/qpid-2935/qpid/packaging/windows/installer.proj:1061302-1072333 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1381622 - /qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Author: shuston
Date: Thu Sep 6 14:26:23 2012
New Revision: 1381622
URL: http://svn.apache.org/viewvc?rev=1381622view=rev
Log:
Fix signed/unsigned compiler warning. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp?rev=1381622r1=1381621r2=1381622view=diff
==
--- qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp Thu Sep 6 14:26:23 2012
@@ -249,7 +249,7 @@ VOID WINAPI ServiceMain(DWORD argc, LPTS
if (all_argc 0) {
int i = 0;
all_argv[i++] = argc 0 ? argv[0] : svcName.c_str();
- for (int j = 0; j cmdline_args.size(); ++j)
+ for (size_t j = 0; j cmdline_args.size(); ++j)
all_argv[i++] = cmdline_args[j].c_str();
for (DWORD k = 1; k argc; ++k)
all_argv[i++] = argv[k];
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1380890 - /qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Author: shuston
Date: Tue Sep 4 21:15:47 2012
New Revision: 1380890
URL: http://svn.apache.org/viewvc?rev=1380890view=rev
Log:
Use command-line and service-start parameters in broker started as a service.
Resolves QPID-4269.
Modified:
qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp?rev=1380890r1=1380889r2=1380890view=diff
==
--- qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp Tue Sep 4 21:15:47 2012
@@ -30,8 +30,15 @@
#include qpid/broker/Broker.h
#include iostream
+#include string
+#include vector
#include windows.h
+namespace {
+ // This will accept args from the command line; augmented with service args.
+ std::vectorstd::string cmdline_args;
+}
+
namespace qpid {
namespace broker {
@@ -229,6 +236,25 @@ VOID WINAPI SvcCtrlHandler(DWORD control
VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv)
{
+// The arguments can come from 2 places. Args set with the executable
+// name when the service is installed come through main() and are now
+// in cmdline_args. Arguments set in StartService come into argc/argv
+// above; if they are set, argv[0] is the service name. Make command
+// line args first; StartService args come later and can override
+// command line args.
+int all_argc = argc + cmdline_args.size();
+if (argc == 0 !cmdline_args.empty())
+ ++all_argc;// No StartService args, so need to add prog name argv[0]
+const char **all_argv = new const char *[all_argc];
+if (all_argc 0) {
+ int i = 0;
+ all_argv[i++] = argc 0 ? argv[0] : svcName.c_str();
+ for (int j = 0; j cmdline_args.size(); ++j)
+all_argv[i++] = cmdline_args[j].c_str();
+ for (DWORD k = 1; k argc; ++k)
+all_argv[i++] = argv[k];
+}
+
::memset(svcStatus, 0, sizeof(svcStatus));
svcStatusHandle = ::RegisterServiceCtrlHandler(svcName.c_str(),
SvcCtrlHandler);
@@ -238,7 +264,9 @@ VOID WINAPI ServiceMain(DWORD argc, LPTS
svcStatus.dwCurrentState = SERVICE_START_PENDING;
::SetServiceStatus(svcStatusHandle, svcStatus);
// QpiddBroker class resets state to running.
-svcStatus.dwWin32ExitCode = run_broker(argc, argv, true);
+svcStatus.dwWin32ExitCode = run_broker(all_argc,
+ const_castchar**(all_argv),
+ true);
svcStatus.dwCurrentState = SERVICE_STOPPED;
svcStatus.dwCheckPoint = 0;
svcStatus.dwWaitHint = 0;
@@ -464,6 +492,11 @@ int main(int argc, char* argv[])
{ , (LPSERVICE_MAIN_FUNCTION)qpid::broker::ServiceMain },
{ NULL, NULL }
};
+// Copy any command line args to be available in case we're started
+// as a service. Pick these back up in ServiceMain.
+for (int i = 1; i argc; ++i)
+ cmdline_args.push_back(argv[i]);
+
if (!StartServiceCtrlDispatcher(dispatchTable)) {
DWORD err = ::GetLastError();
if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // Run as console
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373147 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Author: shuston
Date: Tue Aug 14 22:26:28 2012
New Revision: 1373147
URL: http://svn.apache.org/viewvc?rev=1373147view=rev
Log:
Resolves QPID-4084, changing the format of high-res logged time from
seconds-since-start to date/time, consistent with the POSIX version of the
broker.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp?rev=1373147r1=1373146r2=1373147view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp Tue Aug 14 22:26:28 2012
@@ -20,10 +20,12 @@
*/
#include qpid/sys/Time.h
+#include cmath
#include ostream
#include boost/date_time/posix_time/posix_time.hpp
#include boost/thread/thread_time.hpp
#include windows.h
+#include time.h
using namespace boost::posix_time;
@@ -33,8 +35,16 @@ namespace {
// more or less. Keep track of the start value and the conversion factor to
// seconds.
bool timeInitialized = false;
-LARGE_INTEGER start;
-double freq = 1.0;
+LARGE_INTEGER start_hpc;
+double hpc_freq = 1.0;
+
+double start_time;
+
+/// Static constant to remove time skew between FILETIME and POSIX
+/// time. POSIX and Win32 use different epochs (Jan. 1, 1970 v.s.
+/// Jan. 1, 1601). The following constant defines the difference
+/// in 100ns ticks.
+const DWORDLONG FILETIME_to_timval_skew = 0x19db1ded53e8000;
}
@@ -114,23 +124,59 @@ void outputFormattedNow(std::ostream o)
}
void outputHiresNow(std::ostream o) {
+::time_t tv_sec;
+::tm timeinfo;
+char time_string[100];
+
if (!timeInitialized) {
-start.QuadPart = 0;
+// To start, get the current time from FILETIME which includes
+// sub-second resolution. However, since FILETIME is updated a bit
+// bumpy every 15 msec or so, future time displays will be the
+// starting FILETIME plus a delta based on the high-resolution
+// performance counter.
+FILETIME file_time;
+ULARGE_INTEGER start_usec;
+::GetSystemTimeAsFileTime(file_time); // This is in 100ns units
+start_usec.LowPart = file_time.dwLowDateTime;
+start_usec.HighPart = file_time.dwHighDateTime;
+start_usec.QuadPart -= FILETIME_to_timval_skew;
+start_usec.QuadPart /= 10; // Convert 100ns to usec
+tv_sec = (time_t)(start_usec.QuadPart / (1000 * 1000));
+long tv_usec = (long)(start_usec.QuadPart % (1000 * 1000));
+start_time = static_castdouble(tv_sec);
+start_time += tv_usec / 100.0;
+
+start_hpc.QuadPart = 0;
LARGE_INTEGER iFreq;
iFreq.QuadPart = 1;
-QueryPerformanceCounter(start);
+QueryPerformanceCounter(start_hpc);
QueryPerformanceFrequency(iFreq);
-freq = static_castdouble(iFreq.QuadPart);
+hpc_freq = static_castdouble(iFreq.QuadPart);
timeInitialized = true;
}
-LARGE_INTEGER iNow;
-iNow.QuadPart = 0;
-QueryPerformanceCounter(iNow);
-iNow.QuadPart -= start.QuadPart;
-if (iNow.QuadPart 0)
-iNow.QuadPart = 0;
-double now = static_castdouble(iNow.QuadPart);
-now /= freq; // now is seconds after this
-o std::fixed std::setprecision(8) std::setw(16)
std::setfill('0') now s ;
+LARGE_INTEGER hpc_now;
+hpc_now.QuadPart = 0;
+QueryPerformanceCounter(hpc_now);
+hpc_now.QuadPart -= start_hpc.QuadPart;
+if (hpc_now.QuadPart 0)
+hpc_now.QuadPart = 0;
+double now = static_castdouble(hpc_now.QuadPart);
+now /= hpc_freq; // now is seconds after this
+double fnow = start_time + now;
+double usec, sec;
+usec = modf(fnow, sec);
+tv_sec = static_casttime_t(sec);
+#ifdef _MSC_VER
+::localtime_s(timeinfo, tv_sec);
+#else
+timeinfo = *(::localtime(tv_sec));
+#endif
+::strftime(time_string, 100,
+ %Y-%m-%d %H:%M:%S,
+ timeinfo);
+// No way to set max field width to cleanly output the double usec so
+// convert it back to integral number of usecs and print that.
+unsigned long i_usec = usec * 1000 * 1000;
+o time_string . std::setw(6) std::setfill('0') i_usec
;
}
}}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355394 - /qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Author: shuston
Date: Fri Jun 29 14:01:44 2012
New Revision: 1355394
URL: http://svn.apache.org/viewvc?rev=1355394view=rev
Log:
NO-JIRA: Fix location of sessionreceiver project file.
Modified:
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Modified:
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln?rev=1355394r1=1355393r2=1355394view=diff
==
---
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
(original)
+++
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Fri Jun 29 14:01:44 2012
@@ -21,7 +21,7 @@ Microsoft Visual Studio Solution File, F
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) =
Org.Apache.Qpid.Messaging, ..\src\msvc9\org.apache.qpid.messaging.vcproj,
{AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProject
-Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\msvc9\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355193 - /qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
Author: shuston Date: Thu Jun 28 23:26:52 2012 New Revision: 1355193 URL: http://svn.apache.org/viewvc?rev=1355193view=rev Log: Add missing include of qpid/framing/FieldValue.h. Fixes QPID-4097. Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp Modified: qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp?rev=1355193r1=1355192r2=1355193view=diff == --- qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp (original) +++ qpid/trunk/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp Thu Jun 28 23:26:52 2012 @@ -21,6 +21,7 @@ #include msclr\lock.h #include qpid/client/AsyncSession.h +#include qpid/framing/FieldValue.h #include qpid/framing/FrameSet.h #include qpid/client/SubscriptionManager.h #include qpid/client/Connection.h - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1349075 - /qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
Author: shuston
Date: Tue Jun 12 00:08:30 2012
New Revision: 1349075
URL: http://svn.apache.org/viewvc?rev=1349075view=rev
Log:
Add missing typename. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h?rev=1349075r1=1349074r2=1349075view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicKeyNode.h Tue Jun 12 00:08:30 2012
@@ -208,7 +208,7 @@ class QPID_BROKER_CLASS_EXTERN TopicKeyN
if (ptr != childTokens.end()) {
return ptr-second-add(bKey, fullPattern);
} else {
-TopicKeyNode::shared_ptr child(new
TopicKeyNodeT(next_token));
+typename TopicKeyNode::shared_ptr child(new
TopicKeyNodeT(next_token));
childTokens[next_token] = child;
return child-add(bKey, fullPattern);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1344458 - /qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp
Author: shuston Date: Wed May 30 20:58:40 2012 New Revision: 1344458 URL: http://svn.apache.org/viewvc?rev=1344458view=rev Log: NO-JIRA Fix signed/unsigned warnings on RHEL 5 w/ Boost 1.33.1 Modified: qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Modified: qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp?rev=1344458r1=1344457r2=1344458view=diff == --- qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp (original) +++ qpid/trunk/qpid/cpp/src/tests/QueueTest.cpp Wed May 30 20:58:40 2012 @@ -1425,40 +1425,40 @@ QPID_AUTO_TEST_CASE(testSetPositionFifo) // Verify the front of the queue TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Don't acquire BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(1, c-last.position); // Numbered from 1 +BOOST_CHECK_EQUAL(1u, c-last.position); // Numbered from 1 BOOST_CHECK_EQUAL(1, getContent(c-last.payload)); // Verify the back of the queue QueuedMessage qm; -BOOST_CHECK_EQUAL(10, q-getPosition()); +BOOST_CHECK_EQUAL(10u, q-getPosition()); BOOST_CHECK(q-find(q-getPosition(), qm)); // Back of the queue BOOST_CHECK_EQUAL(10, getContent(qm.payload)); -BOOST_CHECK_EQUAL(10, q-getMessageCount()); +BOOST_CHECK_EQUAL(10u, q-getMessageCount()); // Using setPosition to introduce a gap in sequence numbers. q-setPosition(15); -BOOST_CHECK_EQUAL(10, q-getMessageCount()); -BOOST_CHECK_EQUAL(15, q-getPosition()); +BOOST_CHECK_EQUAL(10u, q-getMessageCount()); +BOOST_CHECK_EQUAL(15u, q-getPosition()); BOOST_CHECK(q-find(10, qm)); // Back of the queue BOOST_CHECK_EQUAL(10, getContent(qm.payload)); q-deliver(contentMessage(16)); c-setPosition(9); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(10, c-last.position); +BOOST_CHECK_EQUAL(10u, c-last.position); BOOST_CHECK_EQUAL(10, getContent(c-last.payload)); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(16, c-last.position); +BOOST_CHECK_EQUAL(16u, c-last.position); BOOST_CHECK_EQUAL(16, getContent(c-last.payload)); // Using setPosition to trunkcate the queue q-setPosition(5); -BOOST_CHECK_EQUAL(5, q-getMessageCount()); +BOOST_CHECK_EQUAL(5u, q-getMessageCount()); q-deliver(contentMessage(6a)); c-setPosition(4); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(5, c-last.position); +BOOST_CHECK_EQUAL(5u, c-last.position); BOOST_CHECK_EQUAL(5, getContent(c-last.payload)); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(6, c-last.position); +BOOST_CHECK_EQUAL(6u, c-last.position); BOOST_CHECK_EQUAL(6a, getContent(c-last.payload)); BOOST_CHECK(!q-dispatch(c)); // No more messages. } @@ -1476,22 +1476,22 @@ QPID_AUTO_TEST_CASE(testSetPositionLvq) m-insertCustomProperty(key, values[i]); q-deliver(m); } -BOOST_CHECK_EQUAL(3, q-getMessageCount()); +BOOST_CHECK_EQUAL(3u, q-getMessageCount()); // Verify the front of the queue TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Don't acquire BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(4, c-last.position); // Numbered from 1 +BOOST_CHECK_EQUAL(4u, c-last.position); // Numbered from 1 BOOST_CHECK_EQUAL(4, getContent(c-last.payload)); // Verify the back of the queue QueuedMessage qm; -BOOST_CHECK_EQUAL(6, q-getPosition()); +BOOST_CHECK_EQUAL(6u, q-getPosition()); BOOST_CHECK(q-find(q-getPosition(), qm)); // Back of the queue BOOST_CHECK_EQUAL(6, getContent(qm.payload)); q-setPosition(5); c-setPosition(4); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(5, c-last.position); // Numbered from 1 +BOOST_CHECK_EQUAL(5u, c-last.position); // Numbered from 1 BOOST_CHECK(!q-dispatch(c)); } @@ -1513,11 +1513,11 @@ QPID_AUTO_TEST_CASE(testSetPositionPrior q-setPosition(3); TestConsumer::shared_ptr c(new TestConsumer(test, false)); // Browse in FIFO order BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(1, c-last.position); +BOOST_CHECK_EQUAL(1u, c-last.position); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(2, c-last.position); +BOOST_CHECK_EQUAL(2u, c-last.position); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(3, c-last.position); +BOOST_CHECK_EQUAL(3u, c-last.position); BOOST_CHECK(!q-dispatch(c)); intrusive_ptrMessage m = contentMessage(4a); @@ -1525,22 +1525,22 @@ QPID_AUTO_TEST_CASE(testSetPositionPrior -setPriority(4); q-deliver(m); BOOST_CHECK(q-dispatch(c)); -BOOST_CHECK_EQUAL(4, c-last.position); +BOOST_CHECK_EQUAL(4u, c-last.position); BOOST_CHECK_EQUAL(4a, getContent(c-last.payload)); // But consumers see priority order c.reset(new TestConsumer(test, true)); BOOST_CHECK(q-dispatch(c
svn commit: r1334484 - in /qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows: AsynchIO.cpp IocpPoller.cpp
Author: shuston
Date: Sat May 5 20:23:48 2012
New Revision: 1334484
URL: http://svn.apache.org/viewvc?rev=1334484view=rev
Log:
Merge in QPID-3759 from trunk and fixes QPID-3982.
Modified:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
Modified:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=1334484r1=1334483r2=1334484view=diff
==
---
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
(original)
+++
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
Sat May 5 20:23:48 2012
@@ -46,16 +46,13 @@ namespace {
/*
* The function pointers for AcceptEx and ConnectEx need to be looked up
- * at run time. Make sure this is done only once.
+ * at run time.
*/
-boost::once_flag lookUpAcceptExOnce = BOOST_ONCE_INIT;
-LPFN_ACCEPTEX fnAcceptEx = 0;
-typedef void (*lookUpFunc)(const qpid::sys::Socket );
-
-void lookUpAcceptEx() {
-SOCKET h = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+const LPFN_ACCEPTEX lookUpAcceptEx(const qpid::sys::Socket s) {
+SOCKET h = toSocketHandle(s);
GUID guidAcceptEx = WSAID_ACCEPTEX;
DWORD dwBytes = 0;
+LPFN_ACCEPTEX fnAcceptEx;
WSAIoctl(h,
SIO_GET_EXTENSION_FUNCTION_POINTER,
guidAcceptEx,
@@ -65,9 +62,9 @@ void lookUpAcceptEx() {
dwBytes,
NULL,
NULL);
-closesocket(h);
if (fnAcceptEx == 0)
throw qpid::Exception(QPID_MSG(Failed to look up AcceptEx));
+return fnAcceptEx;
}
}
@@ -94,18 +91,15 @@ private:
AsynchAcceptor::Callback acceptedCallback;
const Socket socket;
+const LPFN_ACCEPTEX fnAcceptEx;
};
AsynchAcceptor::AsynchAcceptor(const Socket s, Callback callback)
: acceptedCallback(callback),
-socket(s) {
+socket(s),
+fnAcceptEx(lookUpAcceptEx(s)) {
s.setNonblocking();
-#if (BOOST_VERSION = 103500) /* boost 1.35 or later reversed the args */
-boost::call_once(lookUpAcceptExOnce, lookUpAcceptEx);
-#else
-boost::call_once(lookUpAcceptEx, lookUpAcceptExOnce);
-#endif
}
AsynchAcceptor::~AsynchAcceptor()
@@ -114,7 +108,8 @@ AsynchAcceptor::~AsynchAcceptor()
}
void AsynchAcceptor::start(Poller::shared_ptr poller) {
-poller-monitorHandle(PollerHandle(socket), Poller::INPUT);
+PollerHandle ph = PollerHandle(socket);
+poller-monitorHandle(ph, Poller::INPUT);
restart ();
}
@@ -124,14 +119,14 @@ void AsynchAcceptor::restart(void) {
this,
toSocketHandle(socket));
BOOL status;
-status = ::fnAcceptEx(toSocketHandle(socket),
- toSocketHandle(*result-newSocket),
- result-addressBuffer,
- 0,
- AsynchAcceptResult::SOCKADDRMAXLEN,
- AsynchAcceptResult::SOCKADDRMAXLEN,
- bytesReceived,
- result-overlapped());
+status = fnAcceptEx(toSocketHandle(socket),
+toSocketHandle(*result-newSocket),
+result-addressBuffer,
+0,
+AsynchAcceptResult::SOCKADDRMAXLEN,
+AsynchAcceptResult::SOCKADDRMAXLEN,
+bytesReceived,
+result-overlapped());
QPID_WINDOWS_CHECK_ASYNC_START(status);
}
@@ -154,7 +149,7 @@ void AsynchAcceptResult::success(size_t
delete this;
}
-void AsynchAcceptResult::failure(int status) {
+void AsynchAcceptResult::failure(int /*status*/) {
//if (status != WSA_OPERATION_ABORTED)
// Can there be anything else? ;
delete this;
@@ -177,7 +172,7 @@ private:
public:
AsynchConnector(const Socket socket,
-std::string hostname,
+std::string hostname,
uint16_t port,
ConnectedCallback connCb,
FailedCallback failCb = 0);
@@ -185,7 +180,7 @@ public:
};
AsynchConnector::AsynchConnector(const Socket sock,
- std::string hname,
+ std::string hname,
uint16_t p,
ConnectedCallback connCb,
FailedCallback failCb) :
@@ -294,6 +289,8 @@ private:
volatile LONG opsInProgress;
// Is there a write in progress?
volatile bool writeInProgress;
+// Or a read?
+volatile bool readInProgress;
// Deletion requested
svn commit: r1334487 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
Author: shuston
Date: Sat May 5 20:28:27 2012
New Revision: 1334487
URL: http://svn.apache.org/viewvc?rev=1334487view=rev
Log:
Don't go through the IOCP wait if the poller is shut down. Fixes QPID-3982.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp?rev=1334487r1=1334486r2=1334487view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp Sat May 5 20:28:27
2012
@@ -96,6 +96,7 @@ void Poller::shutdown() {
// Allow sloppy code to shut us down more than once.
if (impl-isShutdown)
return;
+impl-isShutdown = true;
ULONG_PTR key = 1;// Tell wait() it's a shutdown, not I/O
PostQueuedCompletionStatus(impl-iocp, 0, key, 0);
}
@@ -110,7 +111,7 @@ bool Poller::interrupt(PollerHandle) {
}
void Poller::run() {
-do {
+while (!impl-isShutdown) {
Poller::Event event = this-wait();
// Handle shutdown
@@ -124,7 +125,7 @@ void Poller::run() {
// This should be impossible
assert(false);
}
-} while (true);
+}
}
void Poller::monitorHandle(PollerHandle handle, Direction dir) {
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1329410 - in /qpid/trunk/qpid/cpp: include/qpid/Url.h src/qpid/broker/QueuedMessage.h
Author: shuston
Date: Mon Apr 23 19:54:21 2012
New Revision: 1329410
URL: http://svn.apache.org/viewvc?rev=1329410view=rev
Log:
Added missing externs for Windows builds. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/include/qpid/Url.h
qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h
Modified: qpid/trunk/qpid/cpp/include/qpid/Url.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/Url.h?rev=1329410r1=1329409r2=1329410view=diff
==
--- qpid/trunk/qpid/cpp/include/qpid/Url.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/Url.h Mon Apr 23 19:54:21 2012
@@ -39,7 +39,7 @@ struct Url : public std::vectorAddress
* on a multi-homed host. */
QPID_COMMON_EXTERN static Url getIpAddressesUrl(uint16_t port);
-QPID_COMMON_EXTERN struct Invalid : public Exception { Invalid(const
std::string s); };
+struct Invalid : public Exception { QPID_COMMON_EXTERN Invalid(const
std::string s); };
/** Convert to string form. */
QPID_COMMON_EXTERN std::string str() const;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h?rev=1329410r1=1329409r2=1329410view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuedMessage.h Mon Apr 23 19:54:21 2012
@@ -22,6 +22,7 @@
#define _QueuedMessage_
#include qpid/broker/Message.h
+#include BrokerImportExport.h
#include iosfwd
namespace qpid {
@@ -48,7 +49,7 @@ inline bool operator(const QueuedMessag
return a.position b.position;
}
-std::ostream operator(std::ostream, const QueuedMessage);
+QPID_BROKER_EXTERN std::ostream operator(std::ostream, const
QueuedMessage);
}}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1328372 - /qpid/trunk/qpid/cpp/include/qpid/Url.h
Author: shuston
Date: Fri Apr 20 13:35:17 2012
New Revision: 1328372
URL: http://svn.apache.org/viewvc?rev=1328372view=rev
Log:
Add missing QPID_COMMON_EXTERN on Invalid needed by recent ha Backup.cpp
reference to it. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/include/qpid/Url.h
Modified: qpid/trunk/qpid/cpp/include/qpid/Url.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/Url.h?rev=1328372r1=1328371r2=1328372view=diff
==
--- qpid/trunk/qpid/cpp/include/qpid/Url.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/Url.h Fri Apr 20 13:35:17 2012
@@ -39,7 +39,7 @@ struct Url : public std::vectorAddress
* on a multi-homed host. */
QPID_COMMON_EXTERN static Url getIpAddressesUrl(uint16_t port);
-struct Invalid : public Exception { Invalid(const std::string s); };
+QPID_COMMON_EXTERN struct Invalid : public Exception { Invalid(const
std::string s); };
/** Convert to string form. */
QPID_COMMON_EXTERN std::string str() const;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1300595 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: shuston
Date: Wed Mar 14 15:39:14 2012
New Revision: 1300595
URL: http://svn.apache.org/viewvc?rev=1300595view=rev
Log:
Ensure both SQL and CLFS tests run if they're built. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1300595r1=1300594r2=1300595view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Wed Mar 14 15:39:14 2012
@@ -326,7 +326,7 @@ if (BUILD_MSSQL)
add_test (store_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix} MSSQL)
endif (BUILD_MSSQL)
if (BUILD_MSCLFS)
- add_test (store_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix} MSSQL-CLFS)
+ add_test (store_tests_clfs ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix} MSSQL-CLFS)
endif (BUILD_MSCLFS)
endif (PYTHON_EXECUTABLE)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1228493 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: shuston
Date: Fri Jan 6 23:01:17 2012
New Revision: 1228493
URL: http://svn.apache.org/viewvc?rev=1228493view=rev
Log:
Run the needed python setup to get the python compiled and ready for the test
runs; fixes QPID-3729
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1228493r1=1228492r2=1228493view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Fri Jan 6 23:01:17 2012
@@ -281,6 +281,15 @@ remember_location(msg_group_test)
install (TARGETS qpid-perftest qpid-latency-test RUNTIME
DESTINATION ${QPID_INSTALL_BINDIR})
+# This should ideally be done as part of the test run, but I don't know a way
+# to get these arguments and the working directory set like Makefile.am does,
+# and have that run during the test pass.
+if (PYTHON_EXECUTABLE)
+ set (python_bld ${CMAKE_CURRENT_BINARY_DIR}/python)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install
--prefix=${pythoon_bld} --install-lib=${python_bld}
--install-scripts=${python_bld}/commands
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../python)
+endif (PYTHON_EXECUTABLE)
+
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (ENV{OUTDIR} ${EXECUTABLE_OUTPUT_PATH})
set (test_script_suffix .ps1)
@@ -319,49 +328,12 @@ add_library(test_store MODULE test_store
target_link_libraries (test_store qpidbroker qpidcommon)
set_target_properties (test_store PROPERTIES PREFIX )
-#EXTRA_DIST += \
-# run_test vg_check \
-# run-unit-tests start_broker python_tests stop_broker
\
-# quick_topictest \
-# quick_perftest \
-# quick_txtest
\
-# topictest \
-# run_header_test \
-# header_test.py \
-# ssl_test\
-# config.null \
-# ais_check \
-# run_federation_tests
\
-# run_acl_tests
\
-# .valgrind.supp \
-# MessageUtils.h \
-# TestMessageStore.h \
-# TxMocks.h \
-# start_cluster stop_cluster restart_cluster
add_library (dlclose_noop MODULE dlclose_noop.c)
#libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
#CLEANFILES+=valgrind.out *.log *.vglog* dummy_test $(unit_wrappers)
#
-## FIXME aconway 2008-05-23: Disabled interop_runner because it uses
-## the obsolete Channel class. Convert to Session and re-enable.
-##
-## check_PROGRAMS += interop_runner
-#
-## interop_runner_SOURCES =\
-## interop_runner.cpp\
-## SimpleTestCaseBase.cpp\
-## BasicP2PTest.cpp \
-## BasicPubSubTest.cpp \
-## SimpleTestCaseBase.h \
-## BasicP2PTest.h\
-## BasicPubSubTest.h \
-## TestCase.h\
-## TestOptions.h ConnectionOptions.h
-## interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs)
-#
-#
## Longer running stability tests, not run by default check: target.
## Not run under valgrind, too slow
#LONG_TESTS=fanout_perftest shared_perftest multiq_perftest topic_perftest
run_failover_soak
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1222330 - in /qpid/trunk/qpid/cpp/src/tests: brokertest.py topictest.ps1
Author: shuston
Date: Thu Dec 22 16:27:33 2011
New Revision: 1222330
URL: http://svn.apache.org/viewvc?rev=1222330view=rev
Log:
Adjust topictest.ps1 to use correct executable names (they changed some time
ago); extend broker start timeout on brokertest.ps1 (Windows broker now takes
19 sec to start?!). NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/tests/brokertest.py
qpid/trunk/qpid/cpp/src/tests/topictest.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/brokertest.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?rev=1222330r1=1222329r2=1222330view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Thu Dec 22 16:27:33 2011
@@ -373,7 +373,7 @@ class Broker(Popen):
self._log_ready = find_in_file(notice Broker running, self.log)
return self._log_ready
-def ready(self, timeout=5, **kwargs):
+def ready(self, timeout=30, **kwargs):
Wait till broker is ready to serve clients
# First make sure the broker is listening by checking the log.
if not retry(self.log_ready, timeout=timeout):
Modified: qpid/trunk/qpid/cpp/src/tests/topictest.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/topictest.ps1?rev=1222330r1=1222329r2=1222330view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/topictest.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/topictest.ps1 Thu Dec 22 16:27:33 2011
@@ -40,13 +40,13 @@ if ($t) {
}
# Find which subdir the exes are in
-. $srcdir\find_prog.ps1 .\topic_listener.exe
+. $srcdir\find_prog.ps1 .\qpid-topic-listener.exe
function subscribe {
param ([int]$num, [string]$sub)
Start subscriber $num
$LOG = subscriber_$num.log
-$cmdline = .\$sub\topic_listener $transactional $LOG 21
+$cmdline = .\$sub\qpid-topic-listener $transactional $LOG 21
if (`$LastExitCode -ne 0) { Remove-Item $LOG }
$cmdblock = $executioncontext.invokecommand.NewScriptBlock($cmdline)
. $srcdir\background.ps1 $cmdblock
@@ -54,7 +54,7 @@ function subscribe {
function publish {
param ([string]$sub)
-Invoke-Expression .\$sub\topic_publisher --messages $message_count
--batches $batches --subscribers $subscribers $host $transactional 21
+Invoke-Expression .\$sub\qpid-topic-publisher --messages $message_count
--batches $batches --subscribers $subscribers $host $transactional 21
}
if ($broker.length) {
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1212826 - in /qpid/trunk/qpid/packaging/windows: INSTALL_NOTES.html installer.proj qpidc.wxs
Author: shuston Date: Sat Dec 10 17:05:19 2011 New Revision: 1212826 URL: http://svn.apache.org/viewvc?rev=1212826view=rev Log: Gets the examples up to date to just before they changed to separate msvc9 and 10 directories. Solves the immediately reported issue but more work will be needed under a different jira. Resolves QPID-3674. Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html qpid/trunk/qpid/packaging/windows/installer.proj qpid/trunk/qpid/packaging/windows/qpidc.wxs Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1212826r1=1212825r2=1212826view=diff == --- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original) +++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Sat Dec 10 17:05:19 2011 @@ -1,11 +1,11 @@ html head -titleApache Qpid C++ 0.10 Installation Notes/title +titleApache Qpid C++ 0.15 Installation Notes/title /head body -H1Apache Qpid C++ 0.10 Installation Notes/H1 +H1Apache Qpid C++ 0.15 Installation Notes/H1 -pThank you for installing Apache Qpid version 0.10 for Windows. +pThank you for installing Apache Qpid version 0.15 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation./p @@ -36,6 +36,11 @@ command prompt window where the broker i H2Using the Example Programs/H2 +pIf you installed the example programs, a new environment variable was +set. codeQPID_ROOT/code refers to the Qpid installation directory. The +Visual Studio project files located in the examples area refer to +codeQPID_ROOT/code to locate both header files and library files./p + pThe example programs are located in the codeexamples/code subdirectory of the Qpid installation directory. There are a number of examples, each with its own subdirectory under codeexamples/code. You can use the examples to @@ -78,7 +83,7 @@ default; therefore, to gain support for must be loaded into the broker. This can be done using the code--load-module/code option to load the needed plugins. For example: pre -cd C:\Program Files\Apache\qpidc-0.9 +cd C:\Program Files\Apache\qpidc-0.15 qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll /pre The code--load-module/code option can also take a full path. The option Modified: qpid/trunk/qpid/packaging/windows/installer.proj URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1212826r1=1212825r2=1212826view=diff == --- qpid/trunk/qpid/packaging/windows/installer.proj (original) +++ qpid/trunk/qpid/packaging/windows/installer.proj Sat Dec 10 17:05:19 2011 @@ -32,6 +32,7 @@ source_root$(MSBuildProjectDirectory)\..\../source_root staging_dir$(MSBuildProjectDirectory)\stage/staging_dir bits Condition='$(bits)' == ''32/bits + qpid_version0.14/qpid_version OutputNameqpidc/OutputName OutputTypePackage/OutputType WixToolPathC:\Program Files (x86)\Windows Installer XML v3.5\bin/WixToolPath @@ -218,9 +219,9 @@ OutputFile=boost_dlls.wxs / Candle ToolPath=$(WixToolPath) - DefineConstants=qpidc_version=0.15 + DefineConstants=qpidc_version=$(qpid_version) InstallerPlatform=x64 - OutputFile=qpidc-0.15-x64.msi / + OutputFile=qpidc-$(qpid_version)-x64.msi / -- Exec Command=heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs / @@ -230,19 +231,13 @@ Exec Command=heat dir $(staging_dir)\bin\boost -var var.boost_dll_dir -dr QpidBin -srd -gg -cg group_BoostDlls -sw5150 -out boost_dlls.wxs / Exec - Command=heat file $(staging_dir)\examples\README.txt -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_README.wxs / - Exec - Command=heat file $(staging_dir)\examples\examples.sln -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_examples.wxs / - Exec - Command=heat dir $(staging_dir)\examples\messaging -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_messaging.wxs / - Exec - Command=heat dir $(staging_dir)\examples\qmf-console -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_qmf-console.wxs / + Command=heat dir $(staging_dir)\examples -var var.examples_dir -dr QpidExamples -srd -gg -cg group_Examples -out examples.wxs / Exec Command=heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg
svn commit: r1212672 - in /qpid/trunk/qpid/cpp/examples: CMakeLists.txt qmf-console/CMakeLists.txt
Author: shuston
Date: Fri Dec 9 22:44:40 2011
New Revision: 1212672
URL: http://svn.apache.org/viewvc?rev=1212672view=rev
Log:
Don't install C++ examples we don't want users basing their learning on any
longer. Fixes QPID-3673.
Modified:
qpid/trunk/qpid/cpp/examples/CMakeLists.txt
qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=1212672r1=1212671r2=1212672view=diff
==
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Fri Dec 9 22:44:40 2011
@@ -63,6 +63,11 @@ macro(add_example subdir example)
target_link_libraries(${subdir}_${example} qpidclient
${_boost_libs_needed})
endif (${ARGC} GREATER 2)
+endmacro(add_example)
+
+macro(add_installed_example subdir example)
+ add_example(${subdir} ${example} ${ARGN})
+
# For installs, don't install the built example; that would be pointless.
# Install the things a user needs to build the example on-site.
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${example}.cpp
@@ -74,7 +79,7 @@ macro(add_example subdir example)
COMPONENT ${QPID_COMPONENT_EXAMPLES})
endif (MSVC)
-endmacro(add_example)
+endmacro(add_installed_example)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
Modified: qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt?rev=1212672r1=1212671r2=1212672view=diff
==
--- qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/qmf-console/CMakeLists.txt Fri Dec 9 22:44:40
2011
@@ -17,7 +17,7 @@
# under the License.
#
-add_example(qmf-console console qmfconsole)
-add_example(qmf-console printevents qmfconsole)
-add_example(qmf-console ping qmfconsole)
-add_example(qmf-console queuestats qmfconsole)
+add_installed_example(qmf-console console qmfconsole)
+add_installed_example(qmf-console printevents qmfconsole)
+add_installed_example(qmf-console ping qmfconsole)
+add_installed_example(qmf-console queuestats qmfconsole)
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1196667 - in /qpid/trunk/qpid/cpp/src/tests: run_acl_tests.ps1 start_broker.ps1
Author: shuston
Date: Wed Nov 2 16:20:41 2011
New Revision: 1196667
URL: http://svn.apache.org/viewvc?rev=1196667view=rev
Log:
Give the broker more time to start; has been timing out lately. NO-JIRA.
Modified:
qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1
qpid/trunk/qpid/cpp/src/tests/start_broker.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1?rev=1196667r1=119r2=1196667view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests.ps1 Wed Nov 2 16:20:41 2011
@@ -50,7 +50,7 @@ Function start_broker($acl_options)
. $srcdir\background.ps1 $cmdblock
# Wait for the broker to start
$wait_time = 0
- while (!(Test-Path qpidd.port) -and ($wait_time -lt 10)) {
+ while (!(Test-Path qpidd.port) -and ($wait_time -lt 30)) {
Start-Sleep 2
$wait_time += 2
}
Modified: qpid/trunk/qpid/cpp/src/tests/start_broker.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/start_broker.ps1?rev=1196667r1=119r2=1196667view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/start_broker.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/start_broker.ps1 Wed Nov 2 16:20:41 2011
@@ -49,7 +49,7 @@ $srcdir = Get-ScriptPath
. $srcdir\background.ps1 $cmdblock
$wait_time = 0
-while (!(Test-Path qpidd.port) -and ($wait_time -lt 10)) {
+while (!(Test-Path qpidd.port) -and ($wait_time -lt 30)) {
Start-Sleep 2
$wait_time += 2
}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1187499 - in /qpid/trunk/qpid/cpp/src: ./ CMakeLists.txt posix/QpiddBroker.cpp qpidd.cpp qpidd.h windows/QpiddBroker.cpp windows/SCM.cpp windows/SCM.h
Author: shuston
Date: Fri Oct 21 18:55:57 2011
New Revision: 1187499
URL: http://svn.apache.org/viewvc?rev=1187499view=rev
Log:
Add ability to run broker as a Windows service; resolves QPID-2519.
Added:
qpid/trunk/qpid/cpp/src/windows/SCM.cpp
- copied unchanged from r1079078,
qpid/branches/QPID-2519/cpp/src/windows/SCM.cpp
qpid/trunk/qpid/cpp/src/windows/SCM.h
- copied unchanged from r1079078,
qpid/branches/QPID-2519/cpp/src/windows/SCM.h
Modified:
qpid/trunk/qpid/cpp/src/ (props changed)
qpid/trunk/qpid/cpp/src/CMakeLists.txt (contents, props changed)
qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp
qpid/trunk/qpid/cpp/src/qpidd.cpp
qpid/trunk/qpid/cpp/src/qpidd.h
qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
Propchange: qpid/trunk/qpid/cpp/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 18:55:57 2011
@@ -0,0 +1,7 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src:926803,927233
+/qpid/branches/QPID-2519/cpp/src:1072051-1079078
+/qpid/branches/java-network-refactor/qpid/cpp/src:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src:1144319-1179855
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1187499r1=1187498r2=1187499view=diff
==
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Oct 21 18:55:57 2011
@@ -665,6 +665,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (qpidd_platform_SOURCES
windows/QpiddBroker.cpp
+windows/SCM.cpp
)
set (qpidmessaging_platform_SOURCES
Propchange: qpid/trunk/qpid/cpp/src/CMakeLists.txt
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 18:55:57 2011
@@ -1,6 +1,7 @@
/qpid/branches/0.5.x-dev/qpid/cpp/src/CMakeLists.txt:892761,894875
/qpid/branches/0.6-release-windows-installer/cpp/src/CMakeLists.txt:926803
/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/CMakeLists.txt:926803,927233,932132
+/qpid/branches/QPID-2519/cpp/src/CMakeLists.txt:1072051-1079078
/qpid/branches/java-network-refactor/qpid/cpp/src/CMakeLists.txt:805429-825319
/qpid/branches/qpid-2935/qpid/cpp/src/CMakeLists.txt:1061302-1072333
/qpid/branches/qpid-3346/qpid/cpp/src/CMakeLists.txt:1144319-1179855
Modified: qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp?rev=1187499r1=1187498r2=1187499view=diff
==
--- qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/posix/QpiddBroker.cpp Fri Oct 21 18:55:57 2011
@@ -196,3 +196,8 @@ int QpiddBroker::execute (QpiddOptions *
}
return 0;
}
+
+int main(int argc, char* argv[])
+{
+return run_broker(argc, argv);
+}
Modified: qpid/trunk/qpid/cpp/src/qpidd.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpidd.cpp?rev=1187499r1=1187498r2=1187499view=diff
==
--- qpid/trunk/qpid/cpp/src/qpidd.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpidd.cpp Fri Oct 21 18:55:57 2011
@@ -31,7 +31,8 @@ using namespace std;
auto_ptrQpiddOptions options;
-int main(int argc, char* argv[])
+// Broker real entry; various system-invoked entrypoints call here.
+int run_broker(int argc, char *argv[], bool hidden)
{
try
{
@@ -43,6 +44,8 @@ int main(int argc, char* argv[])
// module-supplied options.
try {
bootOptions.parse (argc, argv, bootOptions.common.config, true);
+if (hidden)
+bootOptions.log.sinkOptions-detached();
qpid::log::Logger::instance().configure(bootOptions.log);
} catch (const std::exception e) {
// Couldn't configure logging so write the message direct to
stderr.
Modified: qpid/trunk/qpid/cpp/src/qpidd.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpidd.h?rev=1187499r1=1187498r2=1187499view=diff
==
--- qpid/trunk/qpid/cpp/src/qpidd.h (original)
+++ qpid/trunk/qpid/cpp/src/qpidd.h Fri Oct 21 18:55:57 2011
@@ -67,4 +67,7 @@ public:
int execute (QpiddOptions *options);
};
+// Broker real entry; various system-invoked entrypoints call here.
+int run_broker(int argc, char *argv[], bool hidden = false);
+
#endif /*!QPID_H*/
Modified: qpid/trunk/qpid/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/windows
svn commit: r1186990 [16/43] - in /qpid/branches/QPID-2519: ./ bin/ cpp/ cpp/bindings/ cpp/bindings/qmf/python/ cpp/bindings/qmf/ruby/ cpp/bindings/qmf/tests/ cpp/bindings/qmf2/ cpp/bindings/qmf2/exam
Modified: qpid/branches/QPID-2519/cpp/src/tests/acl.py
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/tests/acl.py?rev=1186990r1=1186989r2=1186990view=diff
==
--- qpid/branches/QPID-2519/cpp/src/tests/acl.py (original)
+++ qpid/branches/QPID-2519/cpp/src/tests/acl.py Thu Oct 20 18:42:46 2011
@@ -26,10 +26,11 @@ from qpid.datatypes import uuid4
from qpid.testlib import TestBase010
from qmf.console import Session
from qpid.datatypes import Message
+import qpid.messaging
class ACLFile:
-def __init__(self):
-self.f = open('data_dir/policy.acl','w');
+def __init__(self, policy='data_dir/policy.acl'):
+self.f = open(policy,'w')
def write(self,line):
self.f.write(line)
@@ -50,14 +51,24 @@ class ACLTests(TestBase010):
acl = self.qmf.getObjects(_class=acl)[0]
return acl.reloadACLFile()
+def get_acl_file(self):
+return ACLFile(self.config.defines.get(policy-file,
data_dir/policy.acl))
+
def setUp(self):
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl allow all all\n')
aclf.close()
TestBase010.setUp(self)
self.startQmf()
self.reload_acl()
-
+
+def tearDown(self):
+aclf = self.get_acl_file()
+aclf.write('acl allow all all\n')
+aclf.close()
+self.reload_acl()
+TestBase010.tearDown(self)
+
#=
# ACL general tests
#=
@@ -66,7 +77,7 @@ class ACLTests(TestBase010):
Test the deny all mode
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl allow anonymous all all\n')
aclf.write('acl allow bob@QPID create queue\n')
aclf.write('acl deny all all')
@@ -94,7 +105,7 @@ class ACLTests(TestBase010):
Test the allow all mode
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl deny bob@QPID bind exchange\n')
aclf.write('acl allow all all')
aclf.close()
@@ -126,7 +137,7 @@ class ACLTests(TestBase010):
Test empty groups
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl group\n')
aclf.write('acl group admins bob@QPID joe@QPID\n')
aclf.write('acl allow all all')
@@ -140,7 +151,7 @@ class ACLTests(TestBase010):
Test illegal acl formats
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl group admins bob@QPID joe@QPID\n')
aclf.write('acl allow all all')
aclf.close()
@@ -154,7 +165,7 @@ class ACLTests(TestBase010):
Test illegal extension lines
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('group admins bob@QPID \n')
aclf.write(' \ \n')
aclf.write('joe@QPID \n')
@@ -172,7 +183,7 @@ class ACLTests(TestBase010):
Test proper extention lines
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('group test1 j...@example.com \\ \n') # should be allowed
aclf.write('j...@example.com \\ \n') # should be allowed
aclf.write('j...@test.com \\ \n') # should be allowed
@@ -189,7 +200,7 @@ class ACLTests(TestBase010):
Test a user defined without a realm
Ex. group admin rajith
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('group admin bob\n') # shouldn't be allowed
aclf.write('acl deny admin bind exchange\n')
aclf.write('acl allow all all')
@@ -204,7 +215,7 @@ class ACLTests(TestBase010):
Test a user defined without a realm
Ex. group admin rajith
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('group test1 j...@example.com\n') # should be allowed
aclf.write('group test2 jack_123-j...@example.com\n') # should be
allowed
aclf.write('group test4 host/somemachine.example@example.com\n') #
should be allowed
@@ -215,7 +226,7 @@ class ACLTests(TestBase010):
if (result.text.find(ACL format error,0,len(result.text)) != -1):
self.fail(result)
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('group test1 joe$h...@example.com\n') # shouldn't be allowed
aclf.write('acl allow all all')
aclf.close()
@@ -233,7 +244,7 @@ class ACLTests(TestBase010):
Test illegal queue policy
-aclf = ACLFile()
+aclf = self.get_acl_file()
aclf.write('acl deny bob@QPID create queue name=q2 exclusive=true
policytype=ding\n')
aclf.write('acl allow all all')
svn commit: r1172143 - /qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Author: shuston
Date: Sat Sep 17 23:09:54 2011
New Revision: 1172143
URL: http://svn.apache.org/viewvc?rev=1172143view=rev
Log:
NO_JIRA - fix PYTHONPATH to pick up qmf and enable to store recovery tests to
run.
Modified:
qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1?rev=1172143r1=1172142r2=1172143view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 Sat Sep 17 23:09:54 2011
@@ -111,7 +111,7 @@ Invoke-Expression $prog --quit --port $
# Test 2... store.py starts/stops/restarts its own brokers
$tests = *
-$env:PYTHONPATH=$PYTHON_DIR;$srcdir
+$env:PYTHONPATH=$PYTHON_DIR;$QMF_LIB;$srcdir
$env:QPIDD_EXEC=$prog
$env:STORE_LIB=$store_dir\store$suffix.dll
if ($test_store -eq MSSQL) {
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1161783 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
Author: shuston
Date: Thu Aug 25 22:31:07 2011
New Revision: 1161783
URL: http://svn.apache.org/viewvc?rev=1161783view=rev
Log:
Don't try setsockopt IPV6_V6ONLY when setting up new socket. Doesn't work on
XP. Addresses note I left in QPID-3406.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp?rev=1161783r1=1161782r2=1161783view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Socket.cpp Thu Aug 25 22:31:07 2011
@@ -136,11 +136,6 @@ void Socket::createSocket(const SocketAd
try {
if (nonblocking) setNonblocking();
if (nodelay) setTcpNoDelay();
-if (getAddrInfo(sa).ai_family == AF_INET6) {
-int flag = 1;
-int result = ::setsockopt(socket, IPPROTO_IPV6, IPV6_V6ONLY, (char
*)flag, sizeof(flag));
-QPID_WINSOCK_CHECK(result);
-}
} catch (std::exception) {
::closesocket(s);
socket = INVALID_SOCKET;
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1149571 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: shuston
Date: Fri Jul 22 11:33:08 2011
New Revision: 1149571
URL: http://svn.apache.org/viewvc?rev=1149571view=rev
Log:
Corrected qpid-client-test's name when setting up the test script. NO-JIRA
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1149571r1=1149570r2=1149571view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Fri Jul 22 11:33:08 2011
@@ -278,7 +278,7 @@ set(test_wrap ${shell} ${CMAKE_CURRENT_S
add_test (unit_test ${test_wrap} ${unit_test_LOCATION})
add_test (start_broker ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/start_broker${test_script_suffix})
-add_test (qpid-client-test ${test_wrap} ${qpid-client_test_LOCATION})
+add_test (qpid-client-test ${test_wrap} ${qpid-client-test_LOCATION})
add_test (quick_perftest ${test_wrap} ${qpid-perftest_LOCATION} --summary
--count 100)
add_test (quick_topictest ${test_wrap}
${CMAKE_CURRENT_SOURCE_DIR}/quick_topictest${test_script_suffix})
add_test (quick_txtest ${test_wrap} ${qpid-txtest_LOCATION} --queues 4
--tx-count 10 --quiet)
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1103083 - in /qpid/branches/0.10/qpid/packaging/windows: INSTALL_NOTES.html installer.proj
Author: shuston Date: Sat May 14 12:18:36 2011 New Revision: 1103083 URL: http://svn.apache.org/viewvc?rev=1103083view=rev Log: Move WCF artifacts explicitly instead of wildcarding; update version to 0.10 Modified: qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html qpid/branches/0.10/qpid/packaging/windows/installer.proj Modified: qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html?rev=1103083r1=1103082r2=1103083view=diff == --- qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html (original) +++ qpid/branches/0.10/qpid/packaging/windows/INSTALL_NOTES.html Sat May 14 12:18:36 2011 @@ -1,11 +1,11 @@ html head -titleApache Qpid C++ 0.9 Installation Notes/title +titleApache Qpid C++ 0.10 Installation Notes/title /head body -H1Apache Qpid C++ 0.9 Installation Notes/H1 +H1Apache Qpid C++ 0.10 Installation Notes/H1 -pThank you for installing Apache Qpid version 0.9 for Windows. +pThank you for installing Apache Qpid version 0.10 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation./p Modified: qpid/branches/0.10/qpid/packaging/windows/installer.proj URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/packaging/windows/installer.proj?rev=1103083r1=1103082r2=1103083view=diff == --- qpid/branches/0.10/qpid/packaging/windows/installer.proj (original) +++ qpid/branches/0.10/qpid/packaging/windows/installer.proj Sat May 14 12:18:36 2011 @@ -87,7 +87,8 @@ ItemGroup WcfProjects Include=$(source_root)\wcf\src\Apache\Qpid\**\*.csproj/ - WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\*.dll/ + WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Channel.dll/ + WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Interop.dll/ WcfExamples Include=$(source_root)\wcf\samples\**\* Exclude=$(source_root)\wcf\samples\**\.svn\**/ /ItemGroup @@ -217,9 +218,9 @@ OutputFile=boost_dlls.wxs / Candle ToolPath=$(WixToolPath) - DefineConstants=qpidc_version=0.9 + DefineConstants=qpidc_version=0.10 InstallerPlatform=x64 - OutputFile=qpidc-0.9-x64.msi / + OutputFile=qpidc-0.10-x64.msi / -- Exec Command=heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs / @@ -233,9 +234,9 @@ Exec Command=heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs / Exec - Command=candle -dqpidc_version=0.9 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture) / + Command=candle -dqpidc_version=0.10 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost -dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs api_docs.wxs -arch $(Architecture) / Exec - Command=light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.9-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj / + Command=light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us -out qpidc-0.10-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj boost_dlls.wixobj examples.wixobj api_docs.wixobj / /Target /Project - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1103087 - in /qpid/trunk/qpid/packaging/windows: ./ INSTALL_NOTES.html installer.proj
Author: shuston Date: Sat May 14 12:25:53 2011 New Revision: 1103087 URL: http://svn.apache.org/viewvc?rev=1103087view=rev Log: Merge in version updates; WCF files move from 0.10. NO-JIRA Modified: qpid/trunk/qpid/packaging/windows/ (props changed) qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html qpid/trunk/qpid/packaging/windows/installer.proj Propchange: qpid/trunk/qpid/packaging/windows/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat May 14 12:25:53 2011 @@ -1,3 +1,4 @@ +/qpid/branches/0.10/qpid/packaging/windows:1103083 /qpid/branches/0.5.x-dev/qpid/packaging/windows:892761,894875 /qpid/branches/0.6-release-windows-installer/packaging/windows:926803 /qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926865,927233 Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1103087r1=1103086r2=1103087view=diff == --- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original) +++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Sat May 14 12:25:53 2011 @@ -1,11 +1,11 @@ html head -titleApache Qpid C++ 0.9 Installation Notes/title +titleApache Qpid C++ 0.10 Installation Notes/title /head body -H1Apache Qpid C++ 0.9 Installation Notes/H1 +H1Apache Qpid C++ 0.10 Installation Notes/H1 -pThank you for installing Apache Qpid version 0.9 for Windows. +pThank you for installing Apache Qpid version 0.10 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation./p Modified: qpid/trunk/qpid/packaging/windows/installer.proj URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1103087r1=1103086r2=1103087view=diff == --- qpid/trunk/qpid/packaging/windows/installer.proj (original) +++ qpid/trunk/qpid/packaging/windows/installer.proj Sat May 14 12:25:53 2011 @@ -20,7 +20,7 @@ !-- Packaging script for Apache Qpid on Windows - Builds the C++ and WCF components, and packages those along with user + Builds the C++, .NET, and WCF components, and packages those along with user documentation and the python pieces needed to generate QMF stuff. -- @@ -87,7 +87,8 @@ ItemGroup WcfProjects Include=$(source_root)\wcf\src\Apache\Qpid\**\*.csproj/ - WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\*.dll/ + WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Channel.dll/ + WcfArtifacts Include=$(source_root)\wcf\src\Apache\Qpid\Channel\bin\Release\Apache.Qpid.Interop.dll/ WcfExamples Include=$(source_root)\wcf\samples\**\* Exclude=$(source_root)\wcf\samples\**\.svn\**/ /ItemGroup @@ -217,9 +218,9 @@ OutputFile=boost_dlls.wxs / Candle ToolPath=$(WixToolPath) - DefineConstants=qpidc_version=0.9 + DefineConstants=qpidc_version=0.11 InstallerPlatform=x64 - OutputFile=qpidc-0.9-x64.msi / + OutputFile=qpidc-0.11-x64.msi / -- Exec Command=heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude -gg -cg group_QpidHeaders -out qpid_headers.wxs / @@ -229,13 +230,19 @@ Exec Command=heat dir $(staging_dir)\bin\boost -var var.boost_dll_dir -dr QpidBin -srd -gg -cg group_BoostDlls -sw5150 -out boost_dlls.wxs / Exec - Command=heat dir $(staging_dir)\examples -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples.wxs / + Command=heat file $(staging_dir)\examples\README.txt -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_README.wxs / + Exec + Command=heat file $(staging_dir)\examples\examples.sln -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_examples.wxs / + Exec + Command=heat dir $(staging_dir)\examples\messaging -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_messaging.wxs / + Exec + Command=heat dir $(staging_dir)\examples\qmf-console -var var.examples_dir -dr INSTALLLOCATION -gg -cg group_Examples -out examples_qmf-console.wxs / Exec Command=heat dir $(staging_dir)\docs\api -var var.api_docs_dir -dr QpidDoc -gg -cg group_APIDocs -out api_docs.wxs / Exec - Command=candle -dqpidc_version=0.9 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir) -dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost
svn commit: r1103088 - in /qpid/branches/0.10/qpid/cpp/docs/api: developer.doxygen.in user.doxygen.in
Author: shuston Date: Sat May 14 12:29:29 2011 New Revision: 1103088 URL: http://svn.apache.org/viewvc?rev=1103088view=rev Log: Predefine QMFE_EXTERN so it doesn't show up in generated output; resolves QPID-3258 Modified: qpid/branches/0.10/qpid/cpp/docs/api/developer.doxygen.in qpid/branches/0.10/qpid/cpp/docs/api/user.doxygen.in Modified: qpid/branches/0.10/qpid/cpp/docs/api/developer.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/docs/api/developer.doxygen.in?rev=1103088r1=1103087r2=1103088view=diff == --- qpid/branches/0.10/qpid/cpp/docs/api/developer.doxygen.in (original) +++ qpid/branches/0.10/qpid/cpp/docs/api/developer.doxygen.in Sat May 14 12:29:29 2011 @@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= QMFE_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. Modified: qpid/branches/0.10/qpid/cpp/docs/api/user.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/docs/api/user.doxygen.in?rev=1103088r1=1103087r2=1103088view=diff == --- qpid/branches/0.10/qpid/cpp/docs/api/user.doxygen.in (original) +++ qpid/branches/0.10/qpid/cpp/docs/api/user.doxygen.in Sat May 14 12:29:29 2011 @@ -1021,7 +1021,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= QMFE_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1103089 - in /qpid/trunk/qpid/cpp/docs/api: ./ developer.doxygen.in user.doxygen.in
Author: shuston Date: Sat May 14 12:30:48 2011 New Revision: 1103089 URL: http://svn.apache.org/viewvc?rev=1103089view=rev Log: Predefine QMFE_EXTERN so it doesn't show up in generated output; resolves QPID-3258 Modified: qpid/trunk/qpid/cpp/docs/api/ (props changed) qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in qpid/trunk/qpid/cpp/docs/api/user.doxygen.in Propchange: qpid/trunk/qpid/cpp/docs/api/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat May 14 12:30:48 2011 @@ -0,0 +1,6 @@ +/qpid/branches/0.10/qpid/cpp/docs/api:1103088 +/qpid/branches/0.5.x-dev/qpid/cpp/docs/api:892761,894875 +/qpid/branches/0.6-release-windows-installer/cpp/docs/api:926803 +/qpid/branches/0.6-release-windows-installer/qpid/cpp/docs/api:926803,927233 +/qpid/branches/java-network-refactor/qpid/cpp/docs/api:805429-825319 +/qpid/branches/qpid-2935/qpid/cpp/docs/api:1061302-1072333 Modified: qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in?rev=1103089r1=1103088r2=1103089view=diff == --- qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in (original) +++ qpid/trunk/qpid/cpp/docs/api/developer.doxygen.in Sat May 14 12:30:48 2011 @@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= QMFE_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. Modified: qpid/trunk/qpid/cpp/docs/api/user.doxygen.in URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/user.doxygen.in?rev=1103089r1=1103088r2=1103089view=diff == --- qpid/trunk/qpid/cpp/docs/api/user.doxygen.in (original) +++ qpid/trunk/qpid/cpp/docs/api/user.doxygen.in Sat May 14 12:30:48 2011 @@ -1021,7 +1021,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= QMFE_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1100638 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Author: shuston
Date: Sat May 7 22:03:42 2011
New Revision: 1100638
URL: http://svn.apache.org/viewvc?rev=1100638view=rev
Log:
Added Windows high-res timer output. Resolves QPID-3236
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp?rev=1100638r1=1100637r2=1100638view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp Sat May 7 22:03:42 2011
@@ -27,6 +27,17 @@
using namespace boost::posix_time;
+namespace {
+
+// High-res timing support. This will display times since program start,
+// more or less. Keep track of the start value and the conversion factor to
+// seconds.
+bool timeInitialized = false;
+LARGE_INTEGER start;
+double freq = 1.0;
+
+}
+
namespace qpid {
namespace sys {
@@ -99,11 +110,23 @@ void outputFormattedNow(std::ostream o)
}
void outputHiresNow(std::ostream o) {
-// TODO: This is a stub - replace with windows code that will do the equivalent
-// of the Linux code commented out below. (kpvdr)
-//::timespec time;
-//::clock_gettime(CLOCK_REALTIME, time);
-//o time.tv_sec . std::setw(9) std::setfill('0')
time.tv_nsec s ;
-o X.Xs ;
+if (!timeInitialized) {
+start.QuadPart = 0;
+LARGE_INTEGER iFreq;
+iFreq.QuadPart = 1;
+QueryPerformanceCounter(start);
+QueryPerformanceFrequency(iFreq);
+freq = static_castdouble(iFreq.QuadPart);
+timeInitialized = true;
+}
+LARGE_INTEGER iNow;
+iNow.QuadPart = 0;
+QueryPerformanceCounter(iNow);
+iNow.QuadPart -= start.QuadPart;
+if (iNow.QuadPart 0)
+iNow.QuadPart = 0;
+double now = static_castdouble(iNow.QuadPart);
+now /= freq; // now is seconds after this
+o std::fixed std::setprecision(8) std::setw(16)
std::setfill('0') now s ;
}
}}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1087729 - /qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am
Author: shuston Date: Fri Apr 1 14:52:50 2011 New Revision: 1087729 URL: http://svn.apache.org/viewvc?rev=1087729view=rev Log: Merged r1087341 from trunk to add missing CMakeLists.txt to files to distribute. Fixes QPID-3176. Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am (contents, props changed) Modified: qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am URL: http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am?rev=1087729r1=1087728r2=1087729view=diff == --- qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am (original) +++ qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am Fri Apr 1 14:52:50 2011 @@ -36,7 +36,7 @@ $(MAKEDIST): Makefile examplesdir=$(pkgdatadir)/examples/old_api dist_examples_DATA = $(MAKEDIST) -EXTRA_DIST = README.verify verify verify_all +EXTRA_DIST = README.verify verify verify_all CMakeLists.txt # For older versions of automake abs_top_srcdir = @abs_top_srcdir@ Propchange: qpid/branches/0.10/qpid/cpp/examples/old_api/Makefile.am -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Apr 1 14:52:50 2011 @@ -0,0 +1,6 @@ +/qpid/branches/0.5.x-dev/qpid/cpp/examples/old_api/Makefile.am:892761,894875 +/qpid/branches/0.6-release-windows-installer/cpp/examples/old_api/Makefile.am:926803 +/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples/old_api/Makefile.am:926803,927233 +/qpid/branches/java-network-refactor/qpid/cpp/examples/old_api/Makefile.am:805429-825319 +/qpid/branches/qpid-2935/qpid/cpp/examples/old_api/Makefile.am:1061302-1072333 +/qpid/trunk/qpid/cpp/examples/old_api/Makefile.am:1078099,1079385,1079590,1079830,1080589,1080679,1087341 - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1087341 - /qpid/trunk/qpid/cpp/examples/old_api/Makefile.am
Author: shuston Date: Thu Mar 31 15:33:20 2011 New Revision: 1087341 URL: http://svn.apache.org/viewvc?rev=1087341view=rev Log: Add missing CMakeLists.txt to files to distribute. Fixes QPID-3176. Modified: qpid/trunk/qpid/cpp/examples/old_api/Makefile.am Modified: qpid/trunk/qpid/cpp/examples/old_api/Makefile.am URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/Makefile.am?rev=1087341r1=1087340r2=1087341view=diff == --- qpid/trunk/qpid/cpp/examples/old_api/Makefile.am (original) +++ qpid/trunk/qpid/cpp/examples/old_api/Makefile.am Thu Mar 31 15:33:20 2011 @@ -36,7 +36,7 @@ $(MAKEDIST): Makefile examplesdir=$(pkgdatadir)/examples/old_api dist_examples_DATA = $(MAKEDIST) -EXTRA_DIST = README.verify verify verify_all +EXTRA_DIST = README.verify verify verify_all CMakeLists.txt # For older versions of automake abs_top_srcdir = @abs_top_srcdir@ - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1078833 - in /qpid/branches/0.10/qpid/cpp/examples: ./ CMakeLists.txt
Author: shuston
Date: Mon Mar 7 16:23:25 2011
New Revision: 1078833
URL: http://svn.apache.org/viewvc?rev=1078833view=rev
Log:
Merge change from QPID-3118 from trunk to 0.10 branch. Ok per Justin Ross
3/4/2011
Modified:
qpid/branches/0.10/qpid/cpp/examples/ (props changed)
qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt
Propchange: qpid/branches/0.10/qpid/cpp/examples/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Mar 7 16:23:25 2011
@@ -0,0 +1,6 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/examples:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/examples:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/examples:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/examples:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/examples:1061302-1072333
+/qpid/trunk/qpid/cpp/examples:1078099
Modified: qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt?rev=1078833r1=1078832r2=1078833view=diff
==
--- qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/branches/0.10/qpid/cpp/examples/CMakeLists.txt Mon Mar 7 16:23:25 2011
@@ -77,14 +77,10 @@ macro(add_example subdir example)
endmacro(add_example)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/README.verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify_all
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
if (MSVC)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
-${CMAKE_CURRENT_SOURCE_DIR}/old-examples.sln
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
endif (MSVC)
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1079078 - in /qpid/branches/QPID-2519/cpp/src: CMakeLists.txt posix/QpiddBroker.cpp qpidd.cpp qpidd.h windows/QpiddBroker.cpp windows/SCM.cpp windows/SCM.h windows/Service.cpp windows/Ser
Author: shuston
Date: Tue Mar 8 01:41:53 2011
New Revision: 1079078
URL: http://svn.apache.org/viewvc?rev=1079078view=rev
Log:
Changes applied to be able to install, uninstall, start, stop, run service. Has
trouble running as LocalService (SCM reports timeout after 1 second)
Added:
qpid/branches/QPID-2519/cpp/src/windows/SCM.cpp
qpid/branches/QPID-2519/cpp/src/windows/SCM.h
Removed:
qpid/branches/QPID-2519/cpp/src/windows/Service.cpp
qpid/branches/QPID-2519/cpp/src/windows/Service.h
Modified:
qpid/branches/QPID-2519/cpp/src/CMakeLists.txt
qpid/branches/QPID-2519/cpp/src/posix/QpiddBroker.cpp
qpid/branches/QPID-2519/cpp/src/qpidd.cpp
qpid/branches/QPID-2519/cpp/src/qpidd.h
qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/branches/QPID-2519/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/CMakeLists.txt?rev=1079078r1=1079077r2=1079078view=diff
==
--- qpid/branches/QPID-2519/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/QPID-2519/cpp/src/CMakeLists.txt Tue Mar 8 01:41:53 2011
@@ -660,8 +660,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (qpidd_platform_SOURCES
windows/QpiddBroker.cpp
-windows/Service.h
-windows/Service.cpp
+windows/SCM.cpp
)
set (qpidmessaging_platform_SOURCES
Modified: qpid/branches/QPID-2519/cpp/src/posix/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/posix/QpiddBroker.cpp?rev=1079078r1=1079077r2=1079078view=diff
==
--- qpid/branches/QPID-2519/cpp/src/posix/QpiddBroker.cpp (original)
+++ qpid/branches/QPID-2519/cpp/src/posix/QpiddBroker.cpp Tue Mar 8 01:41:53
2011
@@ -188,3 +188,8 @@ int QpiddBroker::execute (QpiddOptions *
}
return 0;
}
+
+int main(int argc, char* argv[])
+{
+return run_broker(argc, argv);
+}
Modified: qpid/branches/QPID-2519/cpp/src/qpidd.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/qpidd.cpp?rev=1079078r1=1079077r2=1079078view=diff
==
--- qpid/branches/QPID-2519/cpp/src/qpidd.cpp (original)
+++ qpid/branches/QPID-2519/cpp/src/qpidd.cpp Tue Mar 8 01:41:53 2011
@@ -31,7 +31,8 @@ using namespace std;
auto_ptrQpiddOptions options;
-int main(int argc, char* argv[])
+// Broker real entry; various system-invoked entrypoints call here.
+int run_broker(int argc, char *argv[], bool hidden)
{
try
{
@@ -43,6 +44,8 @@ int main(int argc, char* argv[])
// module-supplied options.
try {
bootOptions.parse (argc, argv, bootOptions.common.config, true);
+if (hidden)
+bootOptions.log.sinkOptions-detached();
qpid::log::Logger::instance().configure(bootOptions.log);
} catch (const std::exception e) {
// Couldn't configure logging so write the message direct to
stderr.
Modified: qpid/branches/QPID-2519/cpp/src/qpidd.h
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/qpidd.h?rev=1079078r1=1079077r2=1079078view=diff
==
--- qpid/branches/QPID-2519/cpp/src/qpidd.h (original)
+++ qpid/branches/QPID-2519/cpp/src/qpidd.h Tue Mar 8 01:41:53 2011
@@ -67,4 +67,7 @@ public:
int execute (QpiddOptions *options);
};
+// Broker real entry; various system-invoked entrypoints call here.
+int run_broker(int argc, char *argv[], bool hidden = false);
+
#endif /*!QPID_H*/
Modified: qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp?rev=1079078r1=1079077r2=1079078view=diff
==
--- qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp Tue Mar 8 01:41:53
2011
@@ -19,17 +19,9 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include config.h
-#else
-// These need to be made something sensible, like reading a value from
-// the registry. But for now, get things going with a local definition.
-namespace {
-const char *QPIDD_CONF_FILE = qpid_broker.conf;
-const char *QPIDD_MODULE_DIR = .;
-}
-#endif
+#include config.h
#include qpidd.h
+#include SCM.h
#include qpid/Exception.h
#include qpid/Options.h
#include qpid/Plugin.h
@@ -42,11 +34,6 @@ const char *QPIDD_MODULE_DIR = .;
using namespace qpid::broker;
-// Service support
-#include Service.h
-Services_service( qpidd );
-
-
BootstrapOptions::BootstrapOptions(const char* argv0)
: qpid::Options(Options),
common(, QPIDD_CONF_FILE),
@@ -210,8 +197,56 @@ struct BrokerInfo {
DWORD pid;
};
+// Service-related items. Only involved when running
svn commit: r1078099 - /qpid/trunk/qpid/cpp/examples/CMakeLists.txt
Author: shuston
Date: Fri Mar 4 18:49:36 2011
New Revision: 1078099
URL: http://svn.apache.org/viewvc?rev=1078099view=rev
Log:
Remove moved file refs, related to QPID-3067.
Modified:
qpid/trunk/qpid/cpp/examples/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/examples/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/CMakeLists.txt?rev=1078099r1=1078098r2=1078099view=diff
==
--- qpid/trunk/qpid/cpp/examples/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/CMakeLists.txt Fri Mar 4 18:49:36 2011
@@ -77,14 +77,10 @@ macro(add_example subdir example)
endmacro(add_example)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/README.verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify
- ${CMAKE_CURRENT_SOURCE_DIR}/verify_all
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
if (MSVC)
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
-${CMAKE_CURRENT_SOURCE_DIR}/old-examples.sln
DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
COMPONENT ${QPID_COMPONENT_EXAMPLES})
endif (MSVC)
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1076215 - in /qpid/trunk/qpid/cpp/examples: examples.sln old-examples.sln old_api/old-examples.sln
Author: shuston
Date: Wed Mar 2 13:30:15 2011
New Revision: 1076215
URL: http://svn.apache.org/viewvc?rev=1076215view=rev
Log:
Realign Visual Studio projects to match new examples locations; related to
QPID-3067.
Added:
qpid/trunk/qpid/cpp/examples/old_api/old-examples.sln
- copied, changed from r1076072,
qpid/trunk/qpid/cpp/examples/old-examples.sln
Removed:
qpid/trunk/qpid/cpp/examples/old-examples.sln
Modified:
qpid/trunk/qpid/cpp/examples/examples.sln
Modified: qpid/trunk/qpid/cpp/examples/examples.sln
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/examples.sln?rev=1076215r1=1076214r2=1076215view=diff
==
--- qpid/trunk/qpid/cpp/examples/examples.sln (original)
+++ qpid/trunk/qpid/cpp/examples/examples.sln Wed Mar 2 13:30:15 2011
@@ -32,6 +32,14 @@ Project({8BC9CEB8-8B4A-11D0-8D11-00A0C9
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = messaging_spout,
messaging\messaging_spout.vcproj, {D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}
EndProject
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_console,
qmf-console\qmf-console_console.vcproj,
{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}
+EndProject
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_ping,
qmf-console\qmf-console_ping.vcproj, {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}
+EndProject
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_printevents,
qmf-console\qmf-console_printevents.vcproj,
{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}
+EndProject
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_queuestats,
qmf-console\qmf-console_queuestats.vcproj,
{B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -88,6 +96,22 @@ Global
{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.Build.0 =
Release|Win32
{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.ActiveCfg =
Release|x64
{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|x64.Build.0 =
Release|x64
+ {490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 =
Debug|Win32
+ {490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.ActiveCfg
= Release|Win32
+ {490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.Build.0 =
Release|Win32
+ {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|Win32.Build.0 =
Debug|Win32
+ {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|Win32.ActiveCfg
= Release|Win32
+ {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|Win32.Build.0 =
Release|Win32
+ {72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 =
Debug|Win32
+ {72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.ActiveCfg
= Release|Win32
+ {72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.Build.0 =
Release|Win32
+ {B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 =
Debug|Win32
+ {B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.ActiveCfg
= Release|Win32
+ {B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Copied: qpid/trunk/qpid/cpp/examples/old_api/old-examples.sln (from r1076072,
qpid/trunk/qpid/cpp/examples/old-examples.sln)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/old_api/old-examples.sln?p2=qpid/trunk/qpid/cpp/examples/old_api/old-examples.slnp1=qpid/trunk/qpid/cpp/examples/old-examples.slnr1=1076072r2=1076215rev=1076215view=diff
==
--- qpid/trunk/qpid/cpp/examples/old-examples.sln (original)
+++ qpid/trunk/qpid/cpp/examples/old_api/old-examples.sln Wed Mar 2 13:30:15
2011
@@ -40,14 +40,6 @@ Project({8BC9CEB8-8B4A-11D0-8D11-00A0C9
EndProject
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = pub_sub_topic_publisher,
pub-sub\pub-sub_topic_publisher.vcproj,
{05158653-FECA-1BAD-A430-FD5330E23A2D}
EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_console,
qmf-console\qmf-console_console.vcproj,
{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}
-EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) = qmf_console_ping,
qmf-console\qmf-console_ping.vcproj, {C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}
-EndProject
-Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942
svn commit: r1073566 - in /qpid/branches/QPID-2519/cpp/src: CMakeLists.txt windows/QpiddBroker.cpp windows/Service.cpp windows/Service.h
Author: shuston
Date: Wed Feb 23 00:48:56 2011
New Revision: 1073566
URL: http://svn.apache.org/viewvc?rev=1073566view=rev
Log:
Initial commit of patches applied from QPID-2519, formatted mostly for Qpid
guidelines. Hasn't been built, will need more changes. Checking in for Kerry's
use.
Added:
qpid/branches/QPID-2519/cpp/src/windows/Service.cpp (with props)
qpid/branches/QPID-2519/cpp/src/windows/Service.h (with props)
Modified:
qpid/branches/QPID-2519/cpp/src/CMakeLists.txt
qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp
Modified: qpid/branches/QPID-2519/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/CMakeLists.txt?rev=1073566r1=1073565r2=1073566view=diff
==
--- qpid/branches/QPID-2519/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/QPID-2519/cpp/src/CMakeLists.txt Wed Feb 23 00:48:56 2011
@@ -660,6 +660,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (qpidd_platform_SOURCES
windows/QpiddBroker.cpp
+windows/Service.h
+windows/Service.cpp
)
set (qpidmessaging_platform_SOURCES
Modified: qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp?rev=1073566r1=1073565r2=1073566view=diff
==
--- qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp (original)
+++ qpid/branches/QPID-2519/cpp/src/windows/QpiddBroker.cpp Wed Feb 23 00:48:56
2011
@@ -42,6 +42,11 @@ const char *QPIDD_MODULE_DIR = .;
using namespace qpid::broker;
+// Service support
+#include Service.h
+Services_service( qpidd );
+
+
BootstrapOptions::BootstrapOptions(const char* argv0)
: qpid::Options(Options),
common(, QPIDD_CONF_FILE),
@@ -225,9 +230,39 @@ struct ProcessControlOptions : public qp
}
};
+struct DaemonOptions : public qpid::Options {
+ bool install;
+ bool start;
+ bool stop;
+ bool uninstall;
+ bool daemon;
+ string startType;
+ string account;
+ string password;
+ string depends;
+
+ DaemonOptions()
+ : qpid::Options(Service options), install(false), start(false),
stop(false), uninstall(false), daemon(false),
+ startType(demand)
+ {
+addOptions()
+ (install, qpid::optValue(install), Install as
service)
+ (start-type,
qpid::optValue(startType,auto|demand|disabled), Service start type\nApplied
at install time only.)
+ (account, qpid::optValue(account,(LocalService)),
Account to run as, default is LocalService\nApplied at install time only.)
+ (password, qpid::optValue(password,PASSWORD),
Account password, if needed\nApplied at install time only.)
+ (depends, qpid::optValue(depends,(comma delimited
list)), Names of services that must start before this service\nApplied at
install time only.)
+(start, qpid::optValue(start), Start the service.)
+(stop, qpid::optValue(stop), Stop the service.)
+(uninstall, qpid::optValue(uninstall), Uninstall the service.)
+(daemon, qpid::optValue(daemon), Run as a daemon service
(internal use only);
+ }
+};
+
struct QpiddWindowsOptions : public QpiddOptionsPrivate {
ProcessControlOptions control;
+DaemonOptions daemon;
QpiddWindowsOptions(QpiddOptions *parent) : QpiddOptionsPrivate(parent) {
+parent-add(daemon);
parent-add(control);
}
};
@@ -252,6 +287,19 @@ void QpiddOptions::usage() const {
*this std::endl;
}
+void WINAPI ShutdownProc( void *pContext )
+{
+ if( pContext )
+ reinterpret_castBroker*(pContext)-shutdown();
+}
+
+int __cdecl main(int argc, char* argv[]);
+
+void WINAPI main2( DWORD argc, char* argv[] )
+{
+ (void)main( argc, argv );
+}
+
int QpiddBroker::execute (QpiddOptions *options) {
// Options that affect a running daemon.
QpiddWindowsOptions *myOptions =
@@ -259,6 +307,69 @@ int QpiddBroker::execute (QpiddOptions *
if (myOptions == 0)
throw qpid::Exception(Internal error obtaining platform options);
+ if( myOptions-daemon.install )
+ {
+ size_t p;
+
+ // Handle start type
+ DWORD startType;
+ if( myOptions-daemon.startType.compare( demand ) == 0 )
+ startType = SERVICE_DEMAND_START;
+ else if( myOptions-daemon.startType.compare( auto ) == 0 )
+ startType = SERVICE_AUTO_START;
+ else if( myOptions-daemon.startType.compare( disabled ) == 0
)
+ startType = SERVICE_DISABLED;
+ else if( ! myOptions-daemon.startType.empty() )
+ throw qpid
svn commit: r1073086 - /qpid/trunk/qpid/cpp/INSTALL-WINDOWS
Author: shuston Date: Mon Feb 21 17:33:12 2011 New Revision: 1073086 URL: http://svn.apache.org/viewvc?rev=1073086view=rev Log: Improvements per QPID-3077 Modified: qpid/trunk/qpid/cpp/INSTALL-WINDOWS Modified: qpid/trunk/qpid/cpp/INSTALL-WINDOWS URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/INSTALL-WINDOWS?rev=1073086r1=1073085r2=1073086view=diff == --- qpid/trunk/qpid/cpp/INSTALL-WINDOWS (original) +++ qpid/trunk/qpid/cpp/INSTALL-WINDOWS Mon Feb 21 17:33:12 2011 @@ -64,7 +64,7 @@ manually installed to non-standard locat It is also necessary to set BOOST_ROOT to refer to the base of your Boost installation. The Visual Studio projects refer to it. For example: - # set BOOST_ROOT=C:\Program Files\boost\boost_1_35_0 + # set BOOST_ROOT=C:\Program Files\boost\boost_1_35_0 3. Building from a Source Distribution @@ -75,7 +75,7 @@ Visual Studio solution file which is gen From a command prompt: # cd qpid\cpp - # cmake -i + # cmake -i -G Visual Studio 9 2008 . Output from CMake includes .h files in the include directory, .vcproj files for executables and dlls, and the qpid-cpp.sln solution file. @@ -120,7 +120,12 @@ files that are part of the build. Configure again. Repeat until all the Cache Values are gray. - Click the OK button to generate the project/make files. -Now follow instruction for building from a source distribution in step (3). +Open the qpid-cpp.sln solution located in the build directory, select Debug +or Release, and build. You can build both Release and Debug from the same +project. + +If you build all the projects you can then Build the RUN_TESTS project. +This will run the test suite against the Qpid version just built. 5. Tests - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1072051 - /qpid/branches/QPID-2519/
Author: shuston Date: Fri Feb 18 16:42:42 2011 New Revision: 1072051 URL: http://svn.apache.org/viewvc?rev=1072051view=rev Log: Branch for integrating QPID-2519 adding capability for broker to run as a Windows service. Added: qpid/branches/QPID-2519/ (props changed) - copied from r1072050, qpid/trunk/qpid/ Propchange: qpid/branches/QPID-2519/ -- --- svk:merge (added) +++ svk:merge Fri Feb 18 16:42:42 2011 @@ -0,0 +1,3 @@ +8427bd24-ae5a-4eba-a324-d2fc9c9c6c77:/local/qpid.0-9.ams:1224 +c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid-trunk:1612 +c99eadab-1afc-4df6-acde-a632afdabecb:/local/qpid/trunk/qpid:1616 Propchange: qpid/branches/QPID-2519/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 18 16:42:42 2011 @@ -0,0 +1,4 @@ +/qpid/branches/0.5.x-dev/qpid:892761,894875 +/qpid/branches/0.6-release-windows-installer:926803 +/qpid/branches/0.6-release-windows-installer/qpid:926803,927233 +/qpid/branches/java-network-refactor/qpid:805429-825319 Propchange: qpid/branches/QPID-2519/ -- --- svnmerge-blocked (added) +++ svnmerge-blocked Fri Feb 18 16:42:42 2011 @@ -0,0 +1 @@ +/incubator/qpid/branches/M2:532787,532791,537171,539594,540169,540511,553447,565284,574873,574876,575688,577316,577660,578048,578061,578765,578850 /incubator/qpid/branches/qpid.0-9:492777,496596 Propchange: qpid/branches/QPID-2519/ -- Binary property 'svnmerge-integrated' - no diff available. - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1072073 - /qpid/trunk/qpid/cpp/src/CMakeLists.txt
Author: shuston Date: Fri Feb 18 17:25:04 2011 New Revision: 1072073 URL: http://svn.apache.org/viewvc?rev=1072073view=rev Log: QPID-3061 added incorrect set for Boost_SYSTEM_LIBRARY; removing it Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1072073r1=1072072r2=1072073view=diff == --- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Feb 18 17:25:04 2011 @@ -313,10 +313,6 @@ if (NOT Boost_FILESYSTEM_LIBRARY) set(Boost_FILESYSTEM_LIBRARY boost_filesystem) endif (NOT Boost_FILESYSTEM_LIBRARY) -if (NOT Boost_SYSTEM_LIBRARY) - set(Boost_SYSTEM_LIBRARY boost_system) -endif (NOT Boost_SYSTEM_LIBRARY) - if (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY boost_unit_test_framework) endif (NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY) - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1071820 - in /qpid/trunk/qpid/cpp/bindings/qpid/dotnet: Makefile.am org.apache.qpid.messaging.sessionreceiver.sln
Author: shuston
Date: Thu Feb 17 22:41:06 2011
New Revision: 1071820
URL: http://svn.apache.org/viewvc?rev=1071820view=rev
Log:
Add org.apache.qpid.messaging.sessionreceiver.sln to enable this C# piece to be
built by itself. Added the new file to Makefile.am. Resolves QPID-3057.
Added:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
Modified:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am
Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am?rev=1071820r1=1071819r2=1071820view=diff
==
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/Makefile.am Thu Feb 17 22:41:06
2011
@@ -81,6 +81,7 @@ EXTRA_DIST = winsdk_sources/winsdk_dotne
configure-windows.ps1 \
ReadMe.txt \
org.apache.qpid.messaging.sln \
+ org.apache.qpid.messaging.sessionreceiver.sln \
test/messaging.test/messaging.test.address.cs \
test/messaging.test/messaging.test.duration.cs \
test/messaging.test/messaging.test.cs \
Added:
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln?rev=1071820view=auto
==
---
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
(added)
+++
qpid/trunk/qpid/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
Thu Feb 17 22:41:06 2011
@@ -0,0 +1,76 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+#
+# 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
+#
+
+Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) =
Org.Apache.Qpid.Messaging, src\org.apache.qpid.messaging.vcproj,
{AA5A3B83-5F98-406D-A01C-5A921467A57D}
+EndProject
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
src\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ RelWithDebInfo|Win32 = RelWithDebInfo|Win32
+ RelWithDebInfo|x64 = RelWithDebInfo|x64
+ RelWithDebInfo|x86 = RelWithDebInfo|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.Build.0 =
Debug|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.ActiveCfg =
Debug|x64
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.Build.0 =
Debug|x64
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.ActiveCfg =
Debug|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.Build.0 =
Debug|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.ActiveCfg
= Release|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.Build.0 =
Release|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.ActiveCfg =
Release|x64
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.Build.0 =
Release|x64
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.ActiveCfg =
Release|Win32
+ {AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.Build.0 =
Release|Win32
+
{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.ActiveCfg =
RelWithDebInfo|Win32
+
{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.Build.0 =
RelWithDebInfo|Win32
+
{AA5A3B83-5F98-406D-A01C-5A921467A57D
svn commit: r1071829 - in /qpid/trunk/qpid/packaging/windows: INSTALL_NOTES.html installer.proj qpidc.wxs
Author: shuston Date: Thu Feb 17 22:59:34 2011 New Revision: 1071829 URL: http://svn.apache.org/viewvc?rev=1071829view=rev Log: Update to include qpidtypes, qpidmessaging, and the .NET binding. Resolves QPID-3058 Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html qpid/trunk/qpid/packaging/windows/installer.proj qpid/trunk/qpid/packaging/windows/qpidc.wxs Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1071829r1=1071828r2=1071829view=diff == --- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original) +++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Thu Feb 17 22:59:34 2011 @@ -1,11 +1,11 @@ html head -titleApache Qpid C++ 0.6 Installation Notes/title +titleApache Qpid C++ 0.9 Installation Notes/title /head body -H1Apache Qpid C++ 0.6 Installation Notes/H1 +H1Apache Qpid C++ 0.9 Installation Notes/H1 -pThank you for installing the Apache Qpid version 0.6 for Windows kit. +pThank you for installing Apache Qpid version 0.9 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation./p @@ -20,11 +20,10 @@ on the same system as the client, but it pThe broker executable is installed in the codebin/code subdirectory of your Qpid installation directory. The broker program is -codeqpidd.exe/code. The simplest way to experiment with the -broker is to open a command prompt window, cd to the installation -directory, and execute the broker: +codeqpidd.exe/code. The installation procedure adds the Qpid bin +directory to the PATH environment variable, so the simplest way to experiment +with the broker is to open a command prompt window and execute the broker: pre -cd C:\Program Files\Apache\qpidc-0.6\bin qpidd /pre A small amount of information will be displayed to let you know the broker @@ -65,60 +64,24 @@ channel (C++ Broker Compatible)./p H1Notes/H1 pPlease read the following sections for important notes regarding this release./p -H2WCF Channel/H2 -pThis release includes a new .NET WCF Channel implementation. The WCF DLL -is named codeApache.Qpid.Channel.dll/code located in the codebin/code -directory under the Qpid installation location./p -pWCF Channel programming examples are located in the -codeexamples\Channel/code under the installation directory./p -pThe WCF Channel DLLs are not loaded into the Global Assembly Cache (GAC) -at install time; therefore, they must be referenced explicitly from the install -location./p -pIf you wish to install the WCF Channel DLLs into the GAC, you can use the -following commands (assuming the Qpid install location is -codeC:\Program Files\Apache\qpidc-0.6/code):/p -pre -gacutil -I C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Channel.dll -gacutil -I C:\Program Files\Apache\qpidc-0.6\bin\Apache.Qpid.Interop.dll -/pre -pTo remove the DLLs from the GAC:/p -pre -gacutil /u Apache.Qpid.Channel -gacutil /u Apache.Qpid.Interop -/pre -To use transactions with the WCF channel, you must enable the Microsoft Distributed Transaction Coordinator service and configure it to find and use the Qpid XA transaction module. -ul -li -Update the PATH environment variable for services: -right click iComputer/i, select iProperties Advanced System -Settings Environment Variables System Variables/i and add -C:\Program Files\Apache\qpidc-0.6\bin to the PATH variable. -li -Following the instructions in -a href=http://support.microsoft.com/kb/817066; -http://support.microsoft.com/kb/817066/a, -update the MSDTC security settings to allow XA transactions, and -create an XADLL registry entry for qpidxarm with string (REG_SZ) -value C:\Program Files\Apache\qpidc-0.6\bin\qpidxarm.dll -li -Open iControl Panel Administrative Tools Services/i and start -(or restart) the DTC service and make sure that the DTC service is set -to start automatically when the system reboots. -/ul -H2Broker Persistence Module/H2 -pThis release includes a new persistence module. The broker can use this +H2CLFS-Based Broker Persistence Module/H2 +pThis release includes a second persistence module. The broker can use this module to facilitate durable queues, exchanges, bindings, configuration, and -messages. The persistence module uses SQL Server Express (or SQL Server) 2005 -or newer. The persistence module is a Qpid broker plugin. It is not loaded by +messages. The new persistence module, like the SQL-based store introduced in +Qpid 0.6, uses SQL Server Express (or SQL Server) 2005 or newer. However, it +also used Common Log File System (CLFS) to store message and transaction-related +information. CLFS and, thus, the new store, is available on Windows Vista and +Server 2005 and newer. +The persistence module is a Qpid broker plugin
svn commit: r1044502 - /qpid/trunk/qpid/doc/website/content/download.html
Author: shuston Date: Fri Dec 10 20:37:53 2010 New Revision: 1044502 URL: http://svn.apache.org/viewvc?rev=1044502view=rev Log: Update Riverace info for Windows installer; move Windows Installer section down within Contributed C++ Packages Modified: qpid/trunk/qpid/doc/website/content/download.html Modified: qpid/trunk/qpid/doc/website/content/download.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/website/content/download.html?rev=1044502r1=1044501r2=1044502view=diff == --- qpid/trunk/qpid/doc/website/content/download.html (original) +++ qpid/trunk/qpid/doc/website/content/download.html Fri Dec 10 20:37:53 2010 @@ -385,16 +385,16 @@ Other mirrors: select name=Preferred /div - h3a name=Download-WindowsInstaller/aWindows Installer/h3 - - pThe Windows installer is available from a href=http://www.riverace.com/qpid/downloads.htm;http://www.riverace.com/qpid/downloads.htm/a. It is built from the 0.6 C+#43; broker amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above./p - h2a name=Download-QpidComponents.org/aQpidComponents.org /h2 pa href=http://QpidComponents.org;QpidComponents.org/a provides further components for Apache Qpid, including both persistence and management tools. These components are open source, but are not developed as part of the Apache Qpid project due to licensing or other restrictions./p h2a name=Download-ContributedC%5CPackages/aContributed C+#43; Packages/h2 + h3a name=Download-WindowsInstaller/aWindows Installer/h3 + + pThe Windows installer is available from a href=http://www.riverace.com/qpid/downloads.htm;http://www.riverace.com/qpid/downloads.htm/a. It is built from the C+#43; broker amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above./p + h3a name=Download-PrebuiltLinuxPackages/aPre-built Linux Packages/h3 h4a name=Download-Fedora/aFedora /h4 - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1044504 - /qpid/trunk/qpid/doc/website/README.txt
Author: shuston Date: Fri Dec 10 20:43:16 2010 New Revision: 1044504 URL: http://svn.apache.org/viewvc?rev=1044504view=rev Log: Correct typo in 'wrap' command line Modified: qpid/trunk/qpid/doc/website/README.txt Modified: qpid/trunk/qpid/doc/website/README.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/website/README.txt?rev=1044504r1=1044503r2=1044504view=diff == --- qpid/trunk/qpid/doc/website/README.txt (original) +++ qpid/trunk/qpid/doc/website/README.txt Fri Dec 10 20:43:16 2010 @@ -11,7 +11,7 @@ should be written in XHTML, with one di Use wrap like this: -$ tools/wrap templates/template.html content/filename build/filename +$ tools/wrap template/template.html content/filename build/filename Content for the main pages should be check into the content directory. Content for documentation is created in the ../book - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1044509 - /qpid/site/docs/download.html
Author: shuston Date: Fri Dec 10 20:59:51 2010 New Revision: 1044509 URL: http://svn.apache.org/viewvc?rev=1044509view=rev Log: Generated download updating riverace.com info Modified: qpid/site/docs/download.html Modified: qpid/site/docs/download.html URL: http://svn.apache.org/viewvc/qpid/site/docs/download.html?rev=1044509r1=1044508r2=1044509view=diff == --- qpid/site/docs/download.html (original) +++ qpid/site/docs/download.html Fri Dec 10 20:59:51 2010 @@ -499,16 +499,16 @@ Other mirrors: select name=Preferred /div - h3a name=Download-WindowsInstaller/aWindows Installer/h3 - - pThe Windows installer is available from a href=http://www.riverace.com/qpid/downloads.htm;http://www.riverace.com/qpid/downloads.htm/a. It is built from the 0.6 C+#43; broker amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above./p - h2a name=Download-QpidComponents.org/aQpidComponents.org /h2 pa href=http://QpidComponents.org;QpidComponents.org/a provides further components for Apache Qpid, including both persistence and management tools. These components are open source, but are not developed as part of the Apache Qpid project due to licensing or other restrictions./p h2a name=Download-ContributedC%5CPackages/aContributed C+#43; Packages/h2 + h3a name=Download-WindowsInstaller/aWindows Installer/h3 + + pThe Windows installer is available from a href=http://www.riverace.com/qpid/downloads.htm;http://www.riverace.com/qpid/downloads.htm/a. It is built from the C+#43; broker amp; client and C# WCF Channel source distributions listed above. It has been tested for Windows XP SP3 and above./p + h3a name=Download-PrebuiltLinuxPackages/aPre-built Linux Packages/h3 h4a name=Download-Fedora/aFedora /h4 - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1039421 - /qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Author: shuston
Date: Fri Nov 26 15:39:02 2010
New Revision: 1039421
URL: http://svn.apache.org/viewvc?rev=1039421view=rev
Log:
Increase the broker start timeout to 90 seconds; sometimes the SQL db create
takes a minute or more.
Modified:
qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1?rev=1039421r1=1039420r2=1039421view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 Fri Nov 26 15:39:02 2010
@@ -85,7 +85,7 @@ $cmdblock = $executioncontext.invokecomm
. $srcdir\background.ps1 $cmdblock
$wait_time = 0
-while (!(Test-Path qpidd-store.port) -and ($wait_time -lt 20)) {
+while (!(Test-Path qpidd-store.port) -and ($wait_time -lt 90)) {
Start-Sleep 2
$wait_time += 2
}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1036871 - /qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Author: shuston
Date: Fri Nov 19 14:26:01 2010
New Revision: 1036871
URL: http://svn.apache.org/viewvc?rev=1036871view=rev
Log:
Bump the store-startup timeout from 10 to 20 seconds; creating a SQL db often
causes a timeout failure running a few seconds long.
Modified:
qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1?rev=1036871r1=1036870r2=1036871view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 Fri Nov 19 14:26:01 2010
@@ -85,7 +85,7 @@ $cmdblock = $executioncontext.invokecomm
. $srcdir\background.ps1 $cmdblock
$wait_time = 0
-while (!(Test-Path qpidd-store.port) -and ($wait_time -lt 10)) {
+while (!(Test-Path qpidd-store.port) -and ($wait_time -lt 20)) {
Start-Sleep 2
$wait_time += 2
}
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1035652 - in /qpid/branches/0.8-release-candidates/qpid/cpp/docs/api: ./ developer.doxygen.in user.doxygen.in
Author: shuston Date: Tue Nov 16 15:04:02 2010 New Revision: 1035652 URL: http://svn.apache.org/viewvc?rev=1035652view=rev Log: Merged in QPID-2948 from trunk r1035509. Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/ (props changed) qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 16 15:04:02 2010 @@ -0,0 +1,5 @@ +/qpid/branches/0.5.x-dev/qpid/cpp/docs/api:892761,894875 +/qpid/branches/0.6-release-windows-installer/cpp/docs/api:926803 +/qpid/branches/0.6-release-windows-installer/qpid/cpp/docs/api:926803,927233 +/qpid/branches/java-network-refactor/qpid/cpp/docs/api:805429-825319 +/qpid/trunk/qpid/cpp/docs/api:1035509 Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in?rev=1035652r1=1035651r2=1035652view=diff == --- qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in (original) +++ qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in Tue Nov 16 15:04:02 2010 @@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in?rev=1035652r1=1035651r2=1035652view=diff == --- qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in (original) +++ qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in Tue Nov 16 15:04:02 2010 @@ -1021,7 +1021,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1034751 - /qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
Author: shuston
Date: Sat Nov 13 13:10:42 2010
New Revision: 1034751
URL: http://svn.apache.org/viewvc?rev=1034751view=rev
Log:
Merged fix for QPID-2941 from trunk.
Modified:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
(contents, props changed)
Modified:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp?rev=1034751r1=1034750r2=1034751view=diff
==
---
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
(original)
+++
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
Sat Nov 13 13:10:42 2010
@@ -359,10 +359,13 @@ Messages::recover(qpid::broker::Recovery
std::listMessageInfo::Location::iterator w =
m-where.begin();
while (w != m-where.end()) {
if (w-queueId == loc.queueId) {
-if (loc.transaction.get() != 0)
+if (loc.transaction.get() != 0) {
*w = loc;
-else
-m-where.erase(w);
+++w;
+}
+else {
+w = m-where.erase(w);
+}
}
}
}
@@ -381,6 +384,7 @@ Messages::recover(qpid::broker::Recovery
messages.insert(p);
}
}
+
QPID_LOG(debug, Message log recovery done.);
// Done! Ok, go back and delete all the homeless messages.
BOOST_FOREACH(uint64_t msg, homeless) {
Propchange:
qpid/branches/0.8-release-candidates/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 13 13:10:42 2010
@@ -0,0 +1,5 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:926803,927233
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:805429-825319
+/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp:1034586
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1031841 - /qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt
Author: shuston Date: Fri Nov 5 22:02:57 2010 New Revision: 1031841 URL: http://svn.apache.org/viewvc?rev=1031841view=rev Log: Add design doc for new Windows hybrid SQL-CLFS store. Added: qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt Added: qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt?rev=1031841view=auto == --- qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt (added) +++ qpid/trunk/qpid/cpp/design_docs/windows_clfs_store_design.txt Fri Nov 5 22:02:57 2010 @@ -0,0 +1,239 @@ +Design for Hybrid SQL/CLFS-Based Store in Qpid +== + +CLFS (Common Log File System) is a new facility in recent Windows versions. +CLFS is an ARIES-compliant log intended to support high performance and +transactional applications. CLFS is available in Windows Server 2003R2 and +higher, as well as Windows Vista and Windows 7. + +There is currently an all-SQL store in Qpid. The new hybrid SQL-CLFS store +moves the message, messages-mapping to queues, and transaction aspects +of the SQL store into CLFS logs. Records of queues, exchanges, bindings, +and configurations will remain in SQL. The main goal of this change is +to yield higher performance on the time-critical messaging operations. +CLFS and, therefore, the new hybrid store, is not available on Windows XP +and Windows Server prior to 2003R2; these platforms will need to run the +all-SQL store. + +Note for future consideration: it is possible to maintain all durable +objects in CLFS, which would remove the need for SQL completely. It would +require added log handling as well as the logic to ensure referential +integrity between exchanges and queues via bindings as SQL does today. +Also, the CLFS store counts on the SQL-stored queue records being correct +when recovering messages; if a message operation in the log refers to a queue +ID that's unknown, the CLFS store assumes the queue was deleted in the +previous broker session and the log wasn't updated. That sort of assumption +would need to be revisited if all content moves to a log. + +CLFS Capabilities +- + +This section explains some of the key CLFS concepts that are important +in order to understand the designed use of CLFS for the store. It is +not a complete explanation and is not feature-complete. Please see the +CLFS documentation at MSDN for complete details +(http://msdn.microsoft.com/en-us/library/bb986747%28v=VS.85%29.aspx). + +CLFS provides logs; each log can be dedicated or multiplexed. A multiplexed +log has multiple streams of independent log records; a dedicated log has +only one stream. Each log uses containers to hold the actual data; a log +requires a minimum of two containers, each of which must be at least 512KB. +Thus, the smallest log possible is 1MB. They can, of course, be larger, but +with 1 MB as minimum size for a log, they shouldn't be used willy-nilly. +The maximum number of streams per log is approximately 100. + +As records are written to the log CLFS assigns Log Sequence Numbers (LSNs). +The first valid LSN in a log stream is called the Base, or Tail. CLFS +can automatically reclaim and reuse container space for the log as the +base LSN is moved when records are no longer needed. When a log is multiplexed, +a stream which doesn't move its tail can prevent CLFS from reclaiming space +and cause the log to grow indefinitely. Thus, mixing streams which don't +update (and, thus, move their tails) with streams that are very dynamic in +a single log will probably cause the log to continue to expand even though +much of the space will be unused. + +CLFS provides three LSN types that are used to chain records together: + +- Next: This is a forward sequence maintained by CLFS itself by the order + records are put into the stream. +- Undo-next, Undo-prev: These are backward-looking chains that are used + to link a new record to some previous record(s) in the same stream. + +Also note that although log files are simply located in the file system, +easily locatable, streams within a log are not easily known or listable +outside of some application-specific recording of the stream names somewhere. + +Log Usage +- + +There are two logs in use. + +- Message: Each message will be represented by a chain of log records. All + messages will be intermixed in the same dedicated stream. Each portion of + a message content (sometimes they are written in multiple chunks) as well + as each operation involving a message (enqueue, dequeue, etc.) will be + in a log record chained to the others related to the same message. + +- Transaction: Each transaction, local and distributed, will be represented + by a chain of log records. The record content will denote the transaction + as local or distributed. + +Both transaction
svn commit: r1031842 - in /qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs: Log.cpp Log.h MSSqlClfsProvider.cpp
Author: shuston
Date: Fri Nov 5 22:04:08 2010
New Revision: 1031842
URL: http://svn.apache.org/viewvc?rev=1031842view=rev
Log:
Manage CLFS containers using policies to both create the initial containers and
to automatically grow and shrink the log as needed.
Modified:
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.h
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp?rev=1031842r1=1031841r2=1031842view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp Fri Nov 5 22:04:08 2010
@@ -21,6 +21,7 @@
#include windows.h
#include clfsw32.h
+#include clfsmgmtw32.h
#include sstream
#include string
#include vector
@@ -47,11 +48,12 @@ Log::open(const std::string path, const
logPath = path;
std::string logSpec = log: + path;
size_t specLength = logSpec.length();
-wchar_t *wLogSpec = new wchar_t[specLength + 1];
+std::auto_ptrwchar_t wLogSpec(new wchar_t[specLength + 1]);
size_t converted;
-mbstowcs_s(converted, wLogSpec, specLength+1, logSpec.c_str(),
specLength);
-wLogSpec[converted] = L'\0';
-handle = ::CreateLogFile(wLogSpec,
+mbstowcs_s(converted,
+ wLogSpec.get(), specLength+1,
+ logSpec.c_str(), specLength);
+handle = ::CreateLogFile(wLogSpec.get(),
GENERIC_WRITE | GENERIC_READ,
0,
0,
@@ -62,31 +64,45 @@ Log::open(const std::string path, const
ULONG infoSize = sizeof(info);
BOOL ok = ::GetLogFileInformation(handle, info, infoSize);
QPID_WINDOWS_CHECK_NOT(ok, 0);
+ok = ::RegisterManageableLogClient(handle, 0);
+QPID_WINDOWS_CHECK_NOT(ok, 0);
+
+// Set up policies for how many containers to initially create and how
+// large each container should be. Also, auto-grow the log when container
+// space runs out.
+CLFS_MGMT_POLICY logPolicy;
+logPolicy.Version = CLFS_MGMT_POLICY_VERSION;
+logPolicy.LengthInBytes = sizeof(logPolicy);
+logPolicy.PolicyFlags = 0;
+
// If this is the first time this log is opened, give an opportunity to
// initialize its content.
bool needInitialize(false);
if (info.TotalContainers == 0) {
-std::vectorconst std::wstring paths;
-LPWSTR cPaths[1024];
-size_t pathLength = logPath.length();
-wchar_t *wLogPath = new wchar_t[pathLength + 1];
-mbstowcs_s(converted, wLogPath, pathLength+1,
- logPath.c_str(), pathLength);
-wLogPath[converted] = L'\0';
-for (unsigned short i = 0; i params.containers i 1024; ++i) {
-std::wostringstream path;
-path wLogPath L-container- i std::ends;
-paths.push_back(path.str ());
-cPaths[i] = const_castLPWSTR(paths[i].c_str());
-}
-ok = ::AddLogContainerSet(handle,
- params.containers,
- this-containerSize,
- cPaths,
- NULL);
+// New log; set the configured container size and create the
+// initial set of containers.
+logPolicy.PolicyType = ClfsMgmtPolicyNewContainerSize;
+logPolicy.PolicyParameters.NewContainerSize.SizeInBytes =
containerSize;
+ok = ::InstallLogPolicy(handle, logPolicy);
+QPID_WINDOWS_CHECK_NOT(ok, 0);
+
+ULONGLONG desired(params.containers), actual(0);
+ok = ::SetLogFileSizeWithPolicy(handle, desired, actual);
QPID_WINDOWS_CHECK_NOT(ok, 0);
+
needInitialize = true;
}
+// Ensure that the log is extended as needed and will shrink when 50%
+// becomes unused.
+logPolicy.PolicyType = ClfsMgmtPolicyAutoGrow;
+logPolicy.PolicyParameters.AutoGrow.Enabled = 1;
+ok = ::InstallLogPolicy(handle, logPolicy);
+QPID_WINDOWS_CHECK_NOT(ok, 0);
+logPolicy.PolicyType = ClfsMgmtPolicyAutoShrink;
+logPolicy.PolicyParameters.AutoShrink.Percentage = params.shrinkPct;
+ok = ::InstallLogPolicy(handle, logPolicy);
+QPID_WINDOWS_CHECK_NOT(ok, 0);
+
// Need a marshaling area
ok = ::CreateLogMarshallingArea(handle,
NULL, NULL, NULL,// Alloc, free,
context
@@ -131,7 +147,7 @@ Log::write(void* entry, uint32_t length,
desc, 1,// Buffer descriptor
0, prev, // Undo-Next, Prev
0, 0,// Reservation
-CLFS_FLAG_FORCE_FLUSH
svn commit: r1031315 - /qpid/trunk/qpid/python/qpid/brokertest.py
Author: shuston Date: Thu Nov 4 22:47:10 2010 New Revision: 1031315 URL: http://svn.apache.org/viewvc?rev=1031315view=rev Log: Adjust for Windows which can't do Popen w/ close_fds. Also, when tearDown runs, clear stopem so previously torn down processes don't throw confusing exceptions later. Modified: qpid/trunk/qpid/python/qpid/brokertest.py Modified: qpid/trunk/qpid/python/qpid/brokertest.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=1031315r1=1031314r2=1031315view=diff == --- qpid/trunk/qpid/python/qpid/brokertest.py (original) +++ qpid/trunk/qpid/python/qpid/brokertest.py Thu Nov 4 22:47:10 2010 @@ -153,7 +153,10 @@ class Popen(subprocess.Popen): self.cmd = [ str(x) for x in cmd ] self.returncode = None self.expect = expect -subprocess.Popen.__init__(self, self.cmd, 0, None, subprocess.PIPE, subprocess.PIPE, subprocess.PIPE, close_fds=True) +try: +subprocess.Popen.__init__(self, self.cmd, 0, None, subprocess.PIPE, subprocess.PIPE, subprocess.PIPE, close_fds=True) +except ValueError: # Windows can't do close_fds +subprocess.Popen.__init__(self, self.cmd, 0, None, subprocess.PIPE, subprocess.PIPE, subprocess.PIPE) self.pname = %s-%d % (os.path.split(self.cmd[0])[1], self.pid) msg = Process %s % self.pname self.stdin = ExceptionWrapper(self.stdin, msg) @@ -487,6 +490,7 @@ class BrokerTest(TestCase): for p in self.stopem: try: p.stop() except Exception, e: err.append(str(e)) +self.stopem = []# reset in case more processes start os.chdir(self.rootdir) if err: raise Exception(Unexpected process status:\n+\n .join(err)) - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1031319 - /qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Author: shuston
Date: Thu Nov 4 22:49:32 2010
New Revision: 1031319
URL: http://svn.apache.org/viewvc?rev=1031319view=rev
Log:
1. Enable the second set of tests, now that brokertest.py is checked in and
running. This allows the tests that require a broker restart to be executed.
2. Make the script accept a command line argument to say which store to run the
tests against.
Modified:
qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1?rev=1031319r1=1031318r2=1031319view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_store_tests.ps1 Thu Nov 4 22:49:32 2010
@@ -20,9 +20,15 @@
# Run the store tests.
# There are two sets of tests:
# 1. A subset of the normal broker python tests, dtx and persistence, but
-# run again with the SQL store loaded.
+# run again with the desired store loaded.
# 2. store.py, which tests recovering things across broker restarts.
+$test_store = $args[0]
+if ($test_store -ne MSSQL -and $test_store -ne MSSQL-CLFS) {
+ Invalid store test type $test_store - must be MSSQL or MSSQL-CLFS
+ exit 1
+}
+
$srcdir = Split-Path $myInvocation.InvocationName
$PYTHON_DIR = $srcdir\..\..\..\python
if (!(Test-Path $PYTHON_DIR -pathType Container)) {
@@ -53,13 +59,28 @@ if (!([string]::Compare($sub, Debug, $
$suffix = d
}
+$stamp = Get-Date -format %dMMM_HHmmss
+$env:STORE_LIB=$store_dir\store$suffix.dll
+if ($test_store -eq MSSQL) {
+$test_store_module=$store_dir\mssql_store$suffix.dll
+$env:STORE_SQL_LIB=$test_store_module
+$env:STORE_CATALOG=store_recovery_sql_test_$stamp
+$cat1=store_sql_test_$stamp
+$out = sql_store_test_$stamp
+}
+else {
+$test_store_module=$store_dir\msclfs_store$suffix.dll
+$env:STORE_SQL_CLFS_LIB=$test_store_module
+$env:STORE_CATALOG=store_recovery_clfs_test_$stamp
+$cat1=store_clfs_test_$stamp
+$out = clfs_store_test_$stamp
+}
+
$FAILCODE = 0
# Test 1... re-run some of the regular python broker tests against a broker
# with the store module loaded.
-$stamp = Get-Date -format %dMMM_HHmmss
-$catalog = broker_test_$stamp
-$cmdline = $prog --auth=no --port=0 --log-to-file qpidd-store.log
--module-dir $store_dir --catalog $catalog | foreach { set-content
qpidd-store.port `$_ }
+$cmdline = $prog --auth=no --port=0 --log-to-file qpidd-store.log
--no-module-dir --load-module $env:STORE_LIB --load-module $test_store_module
--catalog $cat1 | foreach { set-content qpidd-store.port `$_ }
$cmdblock = $executioncontext.invokecommand.NewScriptBlock($cmdline)
. $srcdir\background.ps1 $cmdblock
@@ -74,6 +95,7 @@ if (!(Test-Path qpidd-store.port)) {
}
set-item -path env:QPID_PORT -value (get-content -path qpidd-store.port
-totalcount 1)
Remove-Item qpidd-store.port
+
$PYTHON_TEST_DIR = $srcdir\..\..\..\tests\src\py\qpid_tests\broker_0_10
$env:PYTHONPATH=$PYTHON_DIR;$PYTHON_TEST_DIR;$env:PYTHONPATH;$QMF_LIB
python $PYTHON_DIR/qpid-python-test -m dtx -m persistence -b
localhost:$env:QPID_PORT $fails $tests
@@ -81,23 +103,31 @@ $RETCODE=$LASTEXITCODE
if ($RETCODE -ne 0) {
$FAILCODE = 1
}
+
# Piping the output makes the script wait for qpidd to finish.
Invoke-Expression $prog --quit --port $env:QPID_PORT | Write-Output
# Test 2... store.py starts/stops/restarts its own brokers
-# This only works with the brokertest.py changes made by Steve - see QPID-2492.
-#$tests = *
-#$env:PYTHONPATH=$PYTHON_DIR;$srcdir
-#$env:QPIDD_EXEC=$prog
-#$env:STORE_LIB=$store_dir\store$suffix.dll
-#$env:STORE_SQL_LIB=$store_dir\mssql_store$suffix.dll
-#$env:STORE_CATALOG=store_recovery_test_$stamp
-#Invoke-Expression python $PYTHON_DIR/qpid-python-test -m store $tests |
Out-Default
-#$RETCODE=$LASTEXITCODE
-#if ($RETCODE -ne 0) {
-#FAIL store tests
-#$FAILCODE = 1
-#}
+$tests = *
+$env:PYTHONPATH=$PYTHON_DIR;$srcdir
+$env:QPIDD_EXEC=$prog
+$env:STORE_LIB=$store_dir\store$suffix.dll
+if ($test_store -eq MSSQL) {
+$env:STORE_SQL_LIB=$store_dir\mssql_store$suffix.dll
+$env:STORE_CATALOG=store_recovery_sql_test_$stamp
+$out = sql_store_test_$stamp
+}
+else {
+$env:STORE_SQL_CLFS_LIB=$store_dir\msclfs_store$suffix.dll
+$env:STORE_CATALOG=store_recovery_clfs_test_$stamp
+$out = clfs_store_test_$stamp
+}
+Invoke-Expression python $PYTHON_DIR/qpid-python-test -m store -D OUTDIR=$out
$tests | Out-Default
+$RETCODE=$LASTEXITCODE
+if ($RETCODE -ne 0) {
+FAIL $test_store store tests
+$FAILCODE = 1
+}
exit $FAILCODE
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1031323 - /qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Author: shuston
Date: Thu Nov 4 22:50:43 2010
New Revision: 1031323
URL: http://svn.apache.org/viewvc?rev=1031323view=rev
Log:
When running store tests, pass the store type to the script. Also added test
runs for the CLFS store.
Modified:
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1031323r1=1031322r2=1031323view=diff
==
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Thu Nov 4 22:50:43 2010
@@ -293,8 +293,11 @@ if (BUILD_ACL)
add_test (acl_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_acl_tests${test_script_suffix})
endif (BUILD_ACL)
if (BUILD_MSSQL)
- add_test (store_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix})
+ add_test (store_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix} MSSQL)
endif (BUILD_MSSQL)
+if (BUILD_MSCLFS)
+ add_test (store_tests ${shell}
${CMAKE_CURRENT_SOURCE_DIR}/run_store_tests${test_script_suffix} MSSQL-CLFS)
+endif (BUILD_MSCLFS)
endif (PYTHON_EXECUTABLE)
add_library(test_store MODULE test_store.cpp)
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1031325 - in /qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs: MSSqlClfsProvider.cpp Messages.cpp Messages.h
Author: shuston
Date: Thu Nov 4 22:52:10 2010
New Revision: 1031325
URL: http://svn.apache.org/viewvc?rev=1031325view=rev
Log:
Revised Messages to keep track of queues each message is on to enable finding
all messages on a deleted queue. Removed this type of tracking from
MSSqlClfsProvider.cpp.
Modified:
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
Modified: qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp?rev=1031325r1=1031324r2=1031325view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp Thu Nov 4
22:52:10 2010
@@ -21,6 +21,7 @@
#include list
#include map
+#include set
#include stdlib.h
#include string
#include windows.h
@@ -68,21 +69,6 @@ const std::string TblConfig(tblConfig)
const std::string TblExchange(tblExchange);
const std::string TblQueue(tblQueue);
-/*
- * Maintain a map of id - QueueContents. RWlock protecting the map allows
- * concurrent reads so multiple threads can get access to the needed queue;
- * queue lock protects the QueueContents themselves.
- */
-struct QueueContents {
-typedef boost::shared_ptrQueueContents shared_ptr;
-qpid::sys::Mutex lock;
-std::listuint64_t messages;
-};
-
-typedef std::mapuint64_t, QueueContents::shared_ptr QueuesMap;
-qpid::sys::RWlock queuesLock;
-QueuesMap queues;
-
}
namespace qpid {
@@ -494,12 +480,6 @@ MSSqlClfsProvider::create(PersistableQue
db-beginTransaction();
rsQueues.open(db, TblQueue);
rsQueues.add(queue);
-{
-// Db stuff ok so far; add an empty QueueContents for the queue.
-QueueContents::shared_ptr entry(new QueueContents);
-qpid::sys::ScopedWlockqpid::sys::RWlock l(queuesLock);
-queues[queue.getPersistenceId()] = entry;
-}
db-commitTransaction();
}
catch(_com_error e) {
@@ -539,44 +519,13 @@ MSSqlClfsProvider::destroy(PersistableQu
}
/*
- * Now that the SQL stuff has recorded the queue deletion, reflect
- * all the dequeued messages in memory. Don't worry about any errors
- * that occur while reflecting these in the log because:
- * - If we have to recover from this point (or anywhere from here
- * until all messages are dequeued) there's no valid queue ID
- * from the Enqueue record, so recovery will throw it out anyway.
- * - If there is a failure before the SQL changes commit, the
- * existing Enqueue records will replace the message on the
- * queue during recovery.
- * so, the best we could do by logging these dequeue operations is
- * record something that will need to be ignored during recovery.
- *
- * Obtain a write lock to the queue map. Doing so gets this thread
- * exclusive access to the queue map. This means no other thread can
- * come while we're holding it and access, even for read, the list.
- * However, there may already be other previously obtained references
- * to the queue's message list outstanding, so also get the queue's
- * list lock to serialize with any other threads. We should be able
- * to count on the broker not making the destroy() call while other
- * uses of the queue are outstanding, but play it safe.
+ * Now that the SQL stuff has recorded the queue deletion, expunge
+ * all record of the queue from the messages set. Any errors logging
+ * these removals are swallowed because during a recovery the queue
+ * Id won't be present (the SQL stuff already committed) so any references
+ * to it in message operations will be removed.
*/
-std::listuint64_t affectedMessages;
-uint64_t qId = queue.getPersistenceId();
-{
-::qpid::sys::RWlock::ScopedWlock l(queuesLock);
-QueueContents::shared_ptr q = queues[qId];
-{
-::qpid::sys::Mutex::ScopedLock ql(q-lock);
-affectedMessages = q-messages;
-}
-queues.erase(queues.find(qId));
-}
-// Now tell each of the messages they are less one queue commitment.
-Transaction::shared_ptr nonTransactional;
-BOOST_FOREACH(uint64_t msgId, affectedMessages) {
-QPID_LOG(debug, Removing message msgId);
-messages.dequeue(msgId, qId, nonTransactional);
-}
+messages.expunge(queue.getPersistenceId());
}
/**
@@ -856,25 +805,12 @@ MSSqlClfsProvider::enqueue(qpid::broker:
if (tctx)
t = tctx-getTransaction();
}
-uint64_t qId = queue.getPersistenceId();
uint64_t msgId = msg-getPersistenceId();
-QueueContents::shared_ptr q
svn commit: r1031345 - /qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp
Author: shuston Date: Thu Nov 4 23:23:18 2010 New Revision: 1031345 URL: http://svn.apache.org/viewvc?rev=1031345view=rev Log: Fix typo in help message. Modified: qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp Modified: qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp?rev=1031345r1=1031344r2=1031345view=diff == --- qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp (original) +++ qpid/trunk/qpid/cpp/src/tests/qpid-perftest.cpp Thu Nov 4 23:23:18 2010 @@ -216,7 +216,7 @@ const std::string Opts::helpText= For a multi-process test first run:\n qpid-perftest --setup other options\n and wait for it to complete. The remaining process should run concurrently::\n -Run --npubs times: pqid-perftest --publish other options\n +Run --npubs times: qpid-perftest --publish other options\n Run --nsubs times: qpid-perftest --subscribe other options\n Run once: qpid-perftest --control other options\n Note the other options must be identical for all processes.\n; - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1030752 - /qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
Author: shuston
Date: Wed Nov 3 23:12:08 2010
New Revision: 1030752
URL: http://svn.apache.org/viewvc?rev=1030752view=rev
Log:
Catch com exceptions during db recovery and rethrow as ADOExceptions which the
broker can deal with. Resolves QPID-2925.
Modified:
qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp?rev=1030752r1=1030751r2=1030752view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp Wed Nov 3
23:12:08 2010
@@ -1025,75 +1025,99 @@ MSSqlProvider::collectPreparedXids(std::
void
MSSqlProvider::recoverConfigs(qpid::broker::RecoveryManager recoverer)
{
-DatabaseConnection *db = initConnection();
-BlobRecordset rsConfigs;
-rsConfigs.open(db, TblConfig);
-_RecordsetPtr p = (_RecordsetPtr)rsConfigs;
-if (p-BOF p-EndOfFile)
-return; // Nothing to do
-p-MoveFirst();
-while (!p-EndOfFile) {
-uint64_t id = p-Fields-Item[persistenceId]-Value;
-long blobSize = p-Fields-Item[fieldTableBlob]-ActualSize;
-BlobAdapter blob(blobSize);
-blob = p-Fields-Item[fieldTableBlob]-GetChunk(blobSize);
-// Recreate the Config instance and reset its ID.
-broker::RecoverableConfig::shared_ptr config =
-recoverer.recoverConfig(blob);
-config-setPersistenceId(id);
-p-MoveNext();
+DatabaseConnection *db = 0;
+try {
+db = initConnection();
+BlobRecordset rsConfigs;
+rsConfigs.open(db, TblConfig);
+_RecordsetPtr p = (_RecordsetPtr)rsConfigs;
+if (p-BOF p-EndOfFile)
+return; // Nothing to do
+p-MoveFirst();
+while (!p-EndOfFile) {
+uint64_t id = p-Fields-Item[persistenceId]-Value;
+long blobSize = p-Fields-Item[fieldTableBlob]-ActualSize;
+BlobAdapter blob(blobSize);
+blob = p-Fields-Item[fieldTableBlob]-GetChunk(blobSize);
+// Recreate the Config instance and reset its ID.
+broker::RecoverableConfig::shared_ptr config =
+recoverer.recoverConfig(blob);
+config-setPersistenceId(id);
+p-MoveNext();
+}
}
+catch(_com_error e) {
+throw ADOException(Error recovering configs,
+ e,
+ db ? db-getErrors() : );
+}
}
void
MSSqlProvider::recoverExchanges(qpid::broker::RecoveryManager recoverer,
ExchangeMap exchangeMap)
{
-DatabaseConnection *db = initConnection();
-BlobRecordset rsExchanges;
-rsExchanges.open(db, TblExchange);
-_RecordsetPtr p = (_RecordsetPtr)rsExchanges;
-if (p-BOF p-EndOfFile)
-return; // Nothing to do
-p-MoveFirst();
-while (!p-EndOfFile) {
-uint64_t id = p-Fields-Item[persistenceId]-Value;
-long blobSize = p-Fields-Item[fieldTableBlob]-ActualSize;
-BlobAdapter blob(blobSize);
-blob = p-Fields-Item[fieldTableBlob]-GetChunk(blobSize);
-// Recreate the Exchange instance, reset its ID, and remember the
-// ones restored for matching up when recovering bindings.
-broker::RecoverableExchange::shared_ptr exchange =
-recoverer.recoverExchange(blob);
-exchange-setPersistenceId(id);
-exchangeMap[id] = exchange;
-p-MoveNext();
+DatabaseConnection *db = 0;
+try {
+db = initConnection();
+BlobRecordset rsExchanges;
+rsExchanges.open(db, TblExchange);
+_RecordsetPtr p = (_RecordsetPtr)rsExchanges;
+if (p-BOF p-EndOfFile)
+return; // Nothing to do
+p-MoveFirst();
+while (!p-EndOfFile) {
+uint64_t id = p-Fields-Item[persistenceId]-Value;
+long blobSize = p-Fields-Item[fieldTableBlob]-ActualSize;
+BlobAdapter blob(blobSize);
+blob = p-Fields-Item[fieldTableBlob]-GetChunk(blobSize);
+// Recreate the Exchange instance, reset its ID, and remember the
+// ones restored for matching up when recovering bindings.
+broker::RecoverableExchange::shared_ptr exchange =
+recoverer.recoverExchange(blob);
+exchange-setPersistenceId(id);
+exchangeMap[id] = exchange;
+p-MoveNext();
+}
}
+catch(_com_error e) {
+throw ADOException(Error recovering exchanges,
+ e,
+ db ? db-getErrors() : );
+}
}
void
MSSqlProvider::recoverQueues(qpid::broker::RecoveryManager recoverer,
QueueMap queueMap)
{
-DatabaseConnection *db
svn commit: r1029675 - /qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
Author: shuston Date: Mon Nov 1 14:27:10 2010 New Revision: 1029675 URL: http://svn.apache.org/viewvc?rev=1029675view=rev Log: Applied patch from QPID-2590. Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1029675r1=1029674r2=1029675view=diff == --- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original) +++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Mon Nov 1 14:27:10 2010 @@ -86,6 +86,25 @@ gacutil -I C:\Program Files\Apache\qpid gacutil /u Apache.Qpid.Channel gacutil /u Apache.Qpid.Interop /pre +To use transactions with the WCF channel, you must enable the Microsoft Distributed Transaction Coordinator service and configure it to find and use the Qpid XA transaction module. +ul +li +Update the PATH environment variable for services: +right click iComputer/i, select iProperties Advanced System +Settings Environment Variables System Variables/i and add +C:\Program Files\Apache\qpidc-0.6\bin to the PATH variable. +li +Following the instructions in +a href=http://support.microsoft.com/kb/817066; +http://support.microsoft.com/kb/817066/a, +update the MSDTC security settings to allow XA transactions, and +create an XADLL registry entry for qpidxarm with string (REG_SZ) +value C:\Program Files\Apache\qpidc-0.6\bin\qpidxarm.dll +li +Open iControl Panel Administrative Tools Services/i and start +(or restart) the DTC service and make sure that the DTC service is set +to start automatically when the system reboots. +/ul H2Broker Persistence Module/H2 pThis release includes a new persistence module. The broker can use this - Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1029896 - /qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h
Author: shuston
Date: Mon Nov 1 23:51:18 2010
New Revision: 1029896
URL: http://svn.apache.org/viewvc?rev=1029896view=rev
Log:
Squish some could lose data compile warnings from MSVC.
Modified:
qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h
Modified: qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h?rev=1029896r1=1029895r2=1029896view=diff
==
--- qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/Uuid.h Mon Nov 1 23:51:18 2010
@@ -67,7 +67,8 @@ struct Uuid : public boost::arrayuint8_
QPID_COMMON_EXTERN void encode(framing::Buffer buf) const;
QPID_COMMON_EXTERN void decode(framing::Buffer buf);
-QPID_COMMON_EXTERN uint32_t encodedSize() const { return size(); }
+QPID_COMMON_EXTERN uint32_t encodedSize() const
+{ return static_castuint32_t(size()); }
/** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */
QPID_COMMON_EXTERN std::string str() const;
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1028752 - /qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
Author: shuston
Date: Fri Oct 29 14:03:08 2010
New Revision: 1028752
URL: http://svn.apache.org/viewvc?rev=1028752view=rev
Log:
Add missing hello_world and hello_xml examples. Resolves QPID-2919.
Modified:
qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt?rev=1028752r1=1028751r2=1028752view=diff
==
--- qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt Fri Oct 29 14:03:08
2010
@@ -45,3 +45,19 @@ add_messaging_example(map_sender)
add_messaging_example(client)
add_messaging_example(server)
+
+# These don't need Boost or OptionParser
+add_executable(hello_world hello_world.cpp)
+set_target_properties(hello_world PROPERTIES OUTPUT_NAME hello_world)
+target_link_libraries(hello_world qpidmessaging)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/hello_world.cpp
+ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
+ COMPONENT ${QPID_COMPONENT_EXAMPLES})
+
+add_executable(hello_xml hello_xml.cpp)
+set_target_properties(hello_xml PROPERTIES OUTPUT_NAME hello_xml)
+target_link_libraries(hello_xml qpidmessaging)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/hello_xml.cpp
+ DESTINATION ${QPID_INSTALL_EXAMPLESDIR}/messaging
+ COMPONENT ${QPID_COMPONENT_EXAMPLES})
+
-
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
svn commit: r1028156 - /qpid/trunk/qpid/python/qpid/brokertest.py
Author: shuston
Date: Thu Oct 28 01:05:16 2010
New Revision: 1028156
URL: http://svn.apache.org/viewvc?rev=1028156view=rev
Log:
Ported to work on Windows; uses subprocess, not popen3. Resolves QPID-2492.
Modified:
qpid/trunk/qpid/python/qpid/brokertest.py
Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=1028156r1=1028155r2=1028156view=diff
==
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Thu Oct 28 01:05:16 2010
@@ -20,7 +20,7 @@
# Support library for tests that start multiple brokers, e.g. cluster
# or federation
-import os, signal, string, tempfile, popen2, socket, threading, time, imp, re
+import os, signal, string, tempfile, subprocess, socket, threading, time, imp,
re
import qpid, traceback
from qpid import connection, messaging, util
from qpid.compat import format_exc
@@ -104,9 +104,8 @@ def retry(function, timeout=10, delay=.0
delay *= 2
return True
-class Popen(popen2.Popen3):
+class Popen(subprocess.Popen):
-Similar to subprocess.Popen but using popen2 classes for portability.
Can set and verify expectation of process status at end of test.
Dumps command line, stdout, stderr to data dir for debugging.
@@ -154,12 +153,12 @@ class Popen(popen2.Popen3):
self.cmd = [ str(x) for x in cmd ]
self.returncode = None
self.expect = expect
-popen2.Popen3.__init__(self, self.cmd, True)
+subprocess.Popen.__init__(self, self.cmd, 0, None, subprocess.PIPE,
subprocess.PIPE, subprocess.PIPE)
self.pname = %s-%d % (os.path.split(self.cmd[0])[1], self.pid)
msg = Process %s % self.pname
-self.stdin = ExceptionWrapper(self.tochild, msg)
-self.stdout = Popen.OutStream(self.fromchild, self.outfile(out), msg)
-self.stderr = Popen.OutStream(self.childerr, self.outfile(err), msg)
+self.stdin = ExceptionWrapper(self.stdin, msg)
+self.stdout = Popen.OutStream(self.stdout, self.outfile(out), msg)
+self.stderr = Popen.OutStream(self.stderr, self.outfile(err), msg)
f = open(self.outfile(cmd), w)
try: f.write(self.cmd_str())
finally: f.close()
@@ -196,7 +195,18 @@ class Popen(popen2.Popen3):
except: pass
elif self.expect == EXPECT_RUNNING:
try:
-self.kill()
+self.terminate()
+except AttributeError:
+ # no terminate method to Popen..
+ try:
+import signal
+os.kill( self.pid , signal.SIGTERM)
+ except AttributeError:
+# no os.kill, using taskkill.. (Windows only)
+try:
+ os.popen('TASKKILL /PID ' +str(self.pid) + ' /F')
+except:
+ print ERROR: could not terminate process.
except:
self.unexpected(expected running, exit code %d %
self.wait())
else:
@@ -227,7 +237,7 @@ class Popen(popen2.Popen3):
def poll(self):
if self.returncode is None:
-ret = popen2.Popen3.poll(self)
+ret = subprocess.poll(self)
if (ret != -1):
self.returncode = ret
self._cleanup()
@@ -236,7 +246,7 @@ class Popen(popen2.Popen3):
def wait(self):
if self.returncode is None:
self.drain()
-try: self.returncode = popen2.Popen3.wait(self)
+try: self.returncode = subprocess.Popen.wait(self)
except OSError,e: raise OSError(Wait failed %s: %s%(self.pname,
e))
self._cleanup()
return self.returncode
@@ -283,6 +293,14 @@ class Broker(Popen):
self.test = test
self._port=port
+if BrokerTest.store_lib:
+args = args + ['--load-module', BrokerTest.store_lib]
+if BrokerTest.sql_store_lib:
+args = args + ['--load-module', BrokerTest.sql_store_lib]
+args = args + ['--catalog', BrokerTest.sql_catalog]
+if BrokerTest.sql_clfs_store_lib:
+args = args + ['--load-module', BrokerTest.sql_clfs_store_lib]
+args = args + ['--catalog', BrokerTest.sql_catalog]
cmd = [BrokerTest.qpidd_exec, --port, port, --no-module-dir] + args
if not --auth in args: cmd.append(--auth=no)
if wait != None:
@@ -443,13 +461,16 @@ class BrokerTest(TestCase):
# Environment settings.
-qpidd_exec = checkenv(QPIDD_EXEC)
+qpidd_exec = os.path.abspath(checkenv(QPIDD_EXEC))
cluster_lib = os.getenv(CLUSTER_LIB)
xml_lib = os.getenv(XML_LIB)
qpid_config_exec = os.getenv(QPID_CONFIG_EXEC)
qpid_route_exec = os.getenv
svn commit: r1026501 - /qpid/trunk/qpid/cpp/src/tests/store.py
Author: shuston Date: Fri Oct 22 21:40:39 2010 New Revision: 1026501 URL: http://svn.apache.org/viewvc?rev=1026501view=rev Log: Test module to run recovery-oriented store tests. Added: qpid/trunk/qpid/cpp/src/tests/store.py Added: qpid/trunk/qpid/cpp/src/tests/store.py URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/store.py?rev=1026501view=auto == --- qpid/trunk/qpid/cpp/src/tests/store.py (added) +++ qpid/trunk/qpid/cpp/src/tests/store.py Fri Oct 22 21:40:39 2010 @@ -0,0 +1,197 @@ +#!/usr/bin/env python +# +# 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. +# + +import errno, os, time +from qpid.brokertest import * +from qpid import compat, session +from qpid.util import connect +from qpid.connection import Connection +from qpid.datatypes import Message, uuid4 +from qpid.queue import Empty + +class StoreTests(BrokerTest): + + XA_RBROLLBACK = 1 + XA_RBTIMEOUT = 2 + XA_OK = 0 + tx_counter = 0 + + def configure(self, config): +self.config = config +self.defines = self.config.defines +BrokerTest.configure(self, config) + + def setup_connection(self): +socket = connect(self._broker.host(), self._broker.port()) +return Connection(sock=socket) + + def setup_session(self): +self.conn.start() +return self.conn.session(str(uuid4())) + + def start_session(self): +self.conn = self.setup_connection() +self.ssn = self.setup_session() + + def setUp(self): +BrokerTest.setUp(self) +self._broker = self.broker() +self.start_session() + + def cycle_broker(self): +# tearDown resets working dir; change it back after. +d = os.getcwd() +BrokerTest.tearDown(self) +os.chdir(d) +self._broker = None +self._broker = self.broker() +self.conn = self.setup_connection() +self.ssn = self.setup_session() + + def xid(self, txid): +StoreTests.tx_counter += 1 +branchqual = v%s % StoreTests.tx_counter +return self.ssn.xid(format=0, global_id=txid, branch_id=branchqual) + + def testDurableExchange(self): +try: + self.ssn.exchange_delete(exchange=DE1) +except: + # restart the session busted from the exception + self.start_session() + +self.ssn.exchange_declare(exchange=DE1, type=direct, durable=True) +response = self.ssn.exchange_query(name=DE1) +self.assert_(response.durable) +self.assert_(not response.not_found) + +# Cycle the broker and make sure the exchange recovers +self.cycle_broker() +response = self.ssn.exchange_query(name=DE1) +self.assert_(response.durable) +self.assert_(not response.not_found) + +self.ssn.exchange_delete(exchange=DE1) + + def testDurableQueues(self): +try: + self.ssn.queue_delete(queue=DQ1) +except: + self.start_session() + +self.ssn.queue_declare(queue=DQ1, durable=True) +response = self.ssn.queue_query(queue=DQ1) +self.assertEqual(DQ1, response.queue) +self.assert_(response.durable) + +# Cycle the broker and make sure the queue recovers +self.cycle_broker() +response = self.ssn.queue_query(queue=DQ1) +self.assertEqual(DQ1, response.queue) +self.assert_(response.durable) + +self.ssn.queue_delete(queue=DQ1) + + def testDurableBindings(self): +try: + self.ssn.exchange_unbind(queue=DB_Q1, exchange=DB_E1, binding_key=K1) +except: + self.start_session() +try: + self.ssn.exchange_delete(exchange=DB_E1) +except: + self.start_session() +try: + self.ssn.queue_delete(queue=DB_Q1) +except: + self.start_session() + +self.ssn.queue_declare(queue=DB_Q1, durable=True) +self.ssn.exchange_declare(exchange=DB_E1, type=direct, durable=True) +self.ssn.exchange_bind(exchange=DB_E1, queue=DB_Q1, binding_key=K1) + +# Cycle the broker and make sure the binding recovers +self.cycle_broker() +response = self.ssn.exchange_bound(exchange=DB_E1, queue=DB_Q1, binding_key=K1) +self.assert_(not response.exchange_not_found) +self.assert_(not response.queue_not_found) +self.assert_(not response.queue_not_matched) +self.assert_(not response.key_not_matched) + +self.ssn.exchange_unbind(queue=DB_Q1
