qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject svn commit: r1336306 - in /qpid/branches/asyncstore/cpp/src: CMakeLists.txt tests/CMakeLists.txt tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp
Date Wed, 09 May 2012 17:28:35 GMT
Author: kpvdr
Date: Wed May  9 17:28:34 2012
New Revision: 1336306

URL: http://svn.apache.org/viewvc?rev=1336306&view=rev
Log:
QPID-3858: Fixed condition variable wait loop, minor updates to cmake builds

Modified:
    qpid/branches/asyncstore/cpp/src/CMakeLists.txt
    qpid/branches/asyncstore/cpp/src/tests/CMakeLists.txt
    qpid/branches/asyncstore/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp

Modified: qpid/branches/asyncstore/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/CMakeLists.txt?rev=1336306&r1=1336305&r2=1336306&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/CMakeLists.txt (original)
+++ qpid/branches/asyncstore/cpp/src/CMakeLists.txt Wed May  9 17:28:34 2012
@@ -1515,7 +1515,7 @@ if (UNIX)
     )
     set_target_properties (asyncStore PROPERTIES
         PREFIX ""
-        OUTPUT_NAME qpidAsyncStore
+        OUTPUT_NAME asyncStore
         SOVERSION ${asyncStore_version}
     )
     target_link_libraries (asyncStore

Modified: qpid/branches/asyncstore/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/CMakeLists.txt?rev=1336306&r1=1336305&r2=1336306&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/branches/asyncstore/cpp/src/tests/CMakeLists.txt Wed May  9 17:28:34 2012
@@ -369,7 +369,6 @@ if (UNIX)
     add_executable (jrnl2Perf ${jrnl2Perf_SOURCES})
     set_target_properties (jrnl2Perf PROPERTIES
 	    COMPILE_FLAGS "-DJOURNAL2"
-	    LINK_FLAGS "-L${QPID_BUILD_DIR}/src"
     )
     target_link_libraries (jrnl2Perf
 	    asyncStore
@@ -379,7 +378,7 @@ if (UNIX)
 endif (UNIX)
 
 # Async store perf test (asyncPerf)
-set (asyncPerf_SOURCES
+set (asyncStorePerf_SOURCES
 	storePerfTools/asyncPerf/MockPersistableMessage.cpp
 	storePerfTools/asyncPerf/MockPersistableQueue.cpp
 	storePerfTools/asyncPerf/MockTransactionContext.cpp
@@ -400,12 +399,11 @@ set (asyncPerf_SOURCES
 )
 
 if (UNIX)
-    add_executable (asyncPerf ${asyncPerf_SOURCES})
-    set_target_properties (asyncPerf PROPERTIES
+    add_executable (asyncStorePerf ${asyncStorePerf_SOURCES})
+    set_target_properties (asyncStorePerf PROPERTIES
 	    COMPILE_FLAGS "-DJOURNAL2"
-	    LINK_FLAGS "-L${QPID_BUILD_DIR}/src"
     )
-    target_link_libraries (asyncPerf
+    target_link_libraries (asyncStorePerf
 	    boost_program_options
 	    asyncStore
 	    qpidbroker

Modified: qpid/branches/asyncstore/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp?rev=1336306&r1=1336305&r2=1336306&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp
(original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp
Wed May  9 17:28:34 2012
@@ -323,7 +323,7 @@ void
 MockPersistableQueue::pop(QueuedMessagePtr& qm)
 {
     qpid::sys::ScopedLock<qpid::sys::Mutex> l(m_enqueuedMsgsMutex);
-    if (m_enqueuedMsgs.empty()) {
+    while (m_enqueuedMsgs.empty()) {
         m_dequeueCondition.wait(m_enqueuedMsgsMutex);
     }
     qm = m_enqueuedMsgs.front();



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message