[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "nat-traversal" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jun 27 10:24:36 CDT 2011
branch "nat-traversal" has been updated
via 6fd0e584689420e4e2c454be6958d7d7d174e2d1 (commit)
via cde5e4d6f15745d4d63676441bc22fbb48bc96e2 (commit)
via 0f59d2c8e9983cbb90d5c6ebe60017d59532e8cf (commit)
via fa05e9e24e9110f20ee36a3cbbc34d8dc1c37257 (commit)
via 214d39ab9992d065f15983ed6c1672e68ff6f59f (commit)
via e7190d1f1f8f00b032ac0294297da86b77c0e0b9 (commit)
via 2efd9ccf97166aa7b04d1e801ff576aab8e42e03 (commit)
via 6deb16a94cc65923dfe812f839a153b8f38423ae (commit)
via 42ebe7e6ec3a127ad6593cc40a8d07eba2e6d95c (commit)
via 77fbd062c219503ed3735918d4c2346a5b9a9d4b (commit)
via 61a9e819013d5861e6095f8668999645a563f599 (commit)
via 56b528b14638e626592bbe740f1086e96bfe6aef (commit)
via 8039a9686285c955e99623bfb50d51af15fb4340 (commit)
via dca005359d6ebef1ec64a22cd27b6c98dce34fbd (commit)
via a215b14cccc535c3e770bc9af4760979b8d68e28 (commit)
via 4c7d07abae76081c71d2c3e3ba12be0366916aed (commit)
via 2fcfaefe97cb6410798a8f953d1d0e8d3bc86c84 (commit)
via a2ce516dc00012b7af5ce5e2b33880ea07d219cb (commit)
via 6da01131aef4cb6b009514adbd3acfefcbcfd5a7 (commit)
via d813bbcb95b2151ea23404268e18d2fcb891fd20 (commit)
via eb3e3d33fd4fbdb5e734bdac29572f9e2aab8c17 (commit)
via f1ba89aa404fe8e47887d8d9af2692187b9b9c44 (commit)
via da775eff48a280c9c4a4ffc909f348e8b6fedf17 (commit)
via 0b44631d5135fe1ff99346ec991fd722b9785701 (commit)
via 0c0f80099d313b7afb061c0edf1848a1260599fc (commit)
via 5c2cfb8e126af44f886a835297e61c9f00099b44 (commit)
via 4e628d126cdbdcce2d0e45206f0c02bbbc1eaef7 (commit)
via 0baaf07a662a1157210edfceac5c510cd07e7ed7 (commit)
via 270fd2ef3b8309ac10c022e605b3b7651810c1d9 (commit)
via 9967956f986882c50ccba778a3f277eb782ab421 (commit)
via c857c099bf0825ee10e637b0ba5a6860ba0289d2 (commit)
from bb74153265ff2f3a19b0cc6a23458cadb758722f (commit)
Summary of changes:
CMakeLists.txt | 13 +-
.../CollocatedIceStorm/CollocatedIceStorm.h | 2 +-
include/AsteriskSCF/Helpers/Network.h | 4 +-
include/AsteriskSCF/NAT/Candidates.h | 2 +-
include/AsteriskSCF/Testing/IceBoxBoostTest.h | 2 +-
include/AsteriskSCF/ThreadPool/ThreadPool.h | 2 +-
.../AsteriskSCF/WorkQueue/DefaultQueueListener.h | 13 +-
.../AsteriskSCF/WorkQueue/SuspendableWorkQueue.h | 3 +-
include/AsteriskSCF/WorkQueue/WorkQueue.h | 3 +-
src/CMakeLists.txt | 68 ++--------
src/CollocatedIceStorm/CMakeLists.txt | 1 +
src/CollocatedIceStorm/CollocatedIceStorm.cpp | 2 +-
src/Helpers/CMakeLists.txt | 1 +
src/IceUtilCpp.cpp | 21 ---
src/NAT/CMakeLists.txt | 1 +
src/ThreadPool/CMakeLists.txt | 12 +--
src/ThreadPool/ThreadPool.cpp | 36 ++---
src/WorkQueue/CMakeLists.txt | 14 +--
src/WorkQueue/DefaultQueueListener.cpp | 47 +++++--
src/WorkQueue/SuspendableWorkQueue.cpp | 48 +++++--
src/WorkQueue/WorkQueue.cpp | 40 +++++-
test/Async/CMakeLists.txt | 16 +-
test/CMakeLists.txt | 28 ++--
test/Replication/CMakeLists.txt | 17 ++-
test/ThreadPool/CMakeLists.txt | 16 +-
test/ThreadPool/TestThreadPool.cpp | 11 ++-
test/UtilityTests.cpp | 2 +-
test/WorkQueue/CMakeLists.txt | 32 +++---
test/WorkQueue/TestSuspendableWorkQueue.cpp | 139 +++++++++++++++++++-
test/WorkQueue/TestWorkQueue.cpp | 129 ++++++++++++++++++-
30 files changed, 493 insertions(+), 232 deletions(-)
create mode 100644 src/CollocatedIceStorm/CMakeLists.txt
create mode 100644 src/Helpers/CMakeLists.txt
delete mode 100644 src/IceUtilCpp.cpp
create mode 100644 src/NAT/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 6fd0e584689420e4e2c454be6958d7d7d174e2d1
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jun 27 12:54:21 2011 -0230
Fix build issues with merge.
diff --git a/include/AsteriskSCF/Helpers/Network.h b/include/AsteriskSCF/Helpers/Network.h
index 2ff39f9..23a0f3c 100644
--- a/include/AsteriskSCF/Helpers/Network.h
+++ b/include/AsteriskSCF/Helpers/Network.h
@@ -34,7 +34,7 @@ namespace Helpers
// NOTE: I discovered that boost asio covers this territory, only with greater detail. I decided to keep going as I was
// planning something far more basic to use. It's implemented in terms of asio though.
//
-class ASTERISK_SCF_ICEBOX_EXPORT Address
+class ASTSCF_DLL_EXPORT Address
{
//
// We don't want a proper assignment operator, this is to behave more like
@@ -68,7 +68,7 @@ typedef std::vector<AddressPtr> AddressSeq;
/**
*
**/
-class ASTERISK_SCF_ICEBOX_EXPORT DNSQuery
+class ASTSCF_DLL_EXPORT DNSQuery
{
public:
virtual ~DNSQuery();
diff --git a/include/AsteriskSCF/NAT/Candidates.h b/include/AsteriskSCF/NAT/Candidates.h
index 00f33d6..1aa024e 100644
--- a/include/AsteriskSCF/NAT/Candidates.h
+++ b/include/AsteriskSCF/NAT/Candidates.h
@@ -29,7 +29,7 @@ namespace NAT
* toSDP() creates an SDP compliant attribute line for the provided candidate.
*
**/
-std::string ASTERISK_SCF_ICEBOX_EXPORT toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate);
+std::string ASTSCF_DLL_EXPORT toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate);
} /* End of namespace NAT */
} /* End of namespace AsteriskSCF */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bdb66f..d0a9c90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,10 @@ astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
add_subdirectory(CollocatedIceStorm)
add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
-add_subdirectory(Helpers))
+add_subdirectory(Helpers)
+add_subdirectory(NAT)
astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time system)
astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
astscf_component_build_library(astscf-ice-util-cpp)
target_link_libraries(astscf-ice-util-cpp logging-client)
commit cde5e4d6f15745d4d63676441bc22fbb48bc96e2
Merge: bb74153 0f59d2c
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jun 27 11:15:07 2011 -0230
Merge master into nat-traversal
diff --cc src/CMakeLists.txt
index ab1d47f,082821e..4bdb66f
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,54 -1,12 +1,13 @@@
- # Ice Utilities for C++
-
- asterisk_scf_component_init(ice-util-cpp)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
- asterisk_scf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
- asterisk_scf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
- asterisk_scf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
- asterisk_scf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
- asterisk_scf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Network.h)
- asterisk_scf_component_add_file(ice-util-cpp Helpers/Network.cpp)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
- asterisk_scf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Network.h)
- asterisk_scf_component_add_file(ice-util-cpp Helpers/Network.cpp)
-
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/NAT/Candidates.h)
- asterisk_scf_component_add_file(ice-util-cpp NAT/Candidates.cpp)
-
- #
- # Note, strictly speaking this isn't for component development, but as it is part of this
- # library it sort of belongs here.
- #
- asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
- asterisk_scf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
- asterisk_scf_component_add_ice_libraries(ice-util-cpp IceStorm)
- asterisk_scf_component_add_ice_libraries(ice-util-cpp IceBox)
- asterisk_scf_component_add_boost_libraries(ice-util-cpp core thread date_time)
- asterisk_scf_component_add_boost_libraries(ice-util-cpp core system thread date_time)
-
- if(NOT logger_dir)
- message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
- endif()
- include_directories(${logger_dir}/include)
- include_directories(${API_INCLUDE_DIR})
-
- asterisk_scf_component_build_library(ice-util-cpp)
- target_link_libraries(ice-util-cpp logging-client)
- target_link_libraries(ice-util-cpp asterisk-scf-api)
- asterisk_scf_component_install(ice-util-cpp)
-
+ astscf_component_init(astscf-ice-util-cpp)
+ file(GLOB_RECURSE project_headers ../include/*.h)
+ astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
+ add_subdirectory(CollocatedIceStorm)
+ add_subdirectory(WorkQueue)
+ add_subdirectory(ThreadPool)
++add_subdirectory(Helpers))
+ astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
+ astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time)
+ astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
+ astscf_component_build_library(astscf-ice-util-cpp)
+ target_link_libraries(astscf-ice-util-cpp logging-client)
+ astscf_component_install(astscf-ice-util-cpp)
diff --cc src/Helpers/CMakeLists.txt
index 0000000,0000000..1c4069e
new file mode 100644
--- /dev/null
+++ b/src/Helpers/CMakeLists.txt
@@@ -1,0 -1,0 +1,1 @@@
++astscf_component_add_files(astscf-ice-util-cpp Network.cpp)
diff --cc src/NAT/CMakeLists.txt
index 0000000,0000000..b90886b
new file mode 100644
--- /dev/null
+++ b/src/NAT/CMakeLists.txt
@@@ -1,0 -1,0 +1,1 @@@
++astscf_component_add_files(astscf-ice-util-cpp Candidates.cpp)
commit 0f59d2c8e9983cbb90d5c6ebe60017d59532e8cf
Merge: fa05e9e 214d39a
Author: Mark Michelson <mmichelson at digium.com>
Date: Sat Jun 25 16:07:35 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/ice-util-cpp
commit fa05e9e24e9110f20ee36a3cbbc34d8dc1c37257
Author: Mark Michelson <mmichelson at digium.com>
Date: Sat Jun 25 16:07:21 2011 -0500
Fix overlooked compiler error.
diff --git a/src/ThreadPool/ThreadPool.cpp b/src/ThreadPool/ThreadPool.cpp
index 1a8b5c9..6791084 100644
--- a/src/ThreadPool/ThreadPool.cpp
+++ b/src/ThreadPool/ThreadPool.cpp
@@ -60,7 +60,7 @@ public:
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
mShuttingDown = true;
- mControlQueue->shutDown();
+ mControlQueue->shutdown();
mControlQueue = 0;
}
commit 214d39ab9992d065f15983ed6c1672e68ff6f59f
Author: Joshua Colp <jcolp at digium.com>
Date: Sat Jun 25 16:49:36 2011 -0300
Some more renaming.
diff --git a/test/ThreadPool/TestThreadPool.cpp b/test/ThreadPool/TestThreadPool.cpp
index 081cfaa..af00f92 100644
--- a/test/ThreadPool/TestThreadPool.cpp
+++ b/test/ThreadPool/TestThreadPool.cpp
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE(addWork)
BOOST_CHECK(listener->mIdle == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(threadCreation)
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(threadCreation)
BOOST_CHECK(listener->mIdle == 1);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(threadDestruction)
@@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(threadDestruction)
BOOST_CHECK(listener->mIdle == 2);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(oneTaskOneThread)
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(oneTaskOneThread)
BOOST_CHECK(listener->mIdle == 1);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(oneThreadOneTask)
@@ -309,7 +309,7 @@ BOOST_AUTO_TEST_CASE(oneThreadOneTask)
BOOST_CHECK(listener->mIdle == 1);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(oneThreadMultipleTasks)
@@ -348,7 +348,7 @@ BOOST_AUTO_TEST_CASE(oneThreadMultipleTasks)
BOOST_CHECK(listener->mIdle == 1);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(reactivation)
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE(reactivation)
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(taskDistribution)
@@ -444,7 +444,7 @@ BOOST_AUTO_TEST_CASE(taskDistribution)
BOOST_CHECK(listener->mIdle == 2);
BOOST_CHECK(listener->mActive == 0);
BOOST_CHECK(listener->mZombie == 0);
- queue->shutDown();
+ queue->shutdown();
}
BOOST_AUTO_TEST_CASE(zombies)
commit e7190d1f1f8f00b032ac0294297da86b77c0e0b9
Author: Joshua Colp <jcolp at digium.com>
Date: Sat Jun 25 16:47:06 2011 -0300
Make this conform to the slice.
diff --git a/src/ThreadPool/ThreadPool.cpp b/src/ThreadPool/ThreadPool.cpp
index 1a8b5c9..6791084 100644
--- a/src/ThreadPool/ThreadPool.cpp
+++ b/src/ThreadPool/ThreadPool.cpp
@@ -60,7 +60,7 @@ public:
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
mShuttingDown = true;
- mControlQueue->shutDown();
+ mControlQueue->shutdown();
mControlQueue = 0;
}
commit 2efd9ccf97166aa7b04d1e801ff576aab8e42e03
Merge: 77fbd06 6deb16a
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jun 24 16:28:07 2011 -0500
Merge branch 'queue-shutdown'
diff --cc include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
index 5d01d78,6169552..06cc601
--- a/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
+++ b/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
@@@ -40,14 -40,17 +40,17 @@@ class DefaultQueueListenerPriv
* as a matter of convenience.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
+class ASTSCF_DLL_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
{
public:
- DefaultQueueListener(const AsteriskSCF::System::WorkQueue::V1::QueuePtr& queue);
+ DefaultQueueListener(const AsteriskSCF::System::WorkQueue::V1::QueueBasePtr& queue);
~DefaultQueueListener();
- void workAdded(Ice::Long numNewWork, bool wasEmpty);
- void workResumable();
- void emptied();
+
+ void workAdded(const AsteriskSCF::System::WorkQueue::V1::QueueBasePtr&, Ice::Long numNewWork, bool wasEmpty);
+ void workResumable(const AsteriskSCF::System::WorkQueue::V1::QueueBasePtr&);
+ void emptied(const AsteriskSCF::System::WorkQueue::V1::QueueBasePtr&);
+ void shuttingDown(const AsteriskSCF::System::WorkQueue::V1::QueueBasePtr&);
+
private:
boost::shared_ptr<DefaultQueueListenerPriv> mPriv;
};
commit 6deb16a94cc65923dfe812f839a153b8f38423ae
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jun 24 16:21:08 2011 -0500
Change from shutDown to shutdown.
diff --git a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
index 8c3ba09..1717ea1 100644
--- a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
@@ -41,7 +41,7 @@ public:
bool executeWork();
Ice::Long getSize();
void setListener(const AsteriskSCF::System::WorkQueue::V1::QueueListenerPtr& listener);
- void shutDown();
+ void shutdown();
private:
boost::shared_ptr<SuspendableWorkQueuePriv> mPriv;
};
diff --git a/include/AsteriskSCF/WorkQueue/WorkQueue.h b/include/AsteriskSCF/WorkQueue/WorkQueue.h
index f7aee13..1357bd3 100644
--- a/include/AsteriskSCF/WorkQueue/WorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/WorkQueue.h
@@ -40,7 +40,7 @@ public:
bool executeWork();
Ice::Long getSize();
void setListener(const AsteriskSCF::System::WorkQueue::V1::QueueListenerPtr& listener);
- void shutDown();
+ void shutdown();
private:
boost::shared_ptr<WorkQueuePriv> mPriv;
};
diff --git a/src/WorkQueue/SuspendableWorkQueue.cpp b/src/WorkQueue/SuspendableWorkQueue.cpp
index b5346d2..b4f53e1 100644
--- a/src/WorkQueue/SuspendableWorkQueue.cpp
+++ b/src/WorkQueue/SuspendableWorkQueue.cpp
@@ -384,7 +384,7 @@ void SuspendableWorkQueue::setListener(const QueueListenerPtr& listener)
mPriv->mListener = listener;
}
-void SuspendableWorkQueue::shutDown()
+void SuspendableWorkQueue::shutdown()
{
boost::unique_lock<boost::shared_mutex> lock(mPriv->mLock);
mPriv->checkForShuttingDown();
diff --git a/src/WorkQueue/WorkQueue.cpp b/src/WorkQueue/WorkQueue.cpp
index fa50b5c..a4a9da0 100644
--- a/src/WorkQueue/WorkQueue.cpp
+++ b/src/WorkQueue/WorkQueue.cpp
@@ -185,7 +185,7 @@ void WorkQueue::setListener(const QueueListenerPtr& listener)
mPriv->mListener = listener;
}
-void WorkQueue::shutDown()
+void WorkQueue::shutdown()
{
boost::unique_lock<boost::shared_mutex> lock(mPriv->mLock);
mPriv->checkForShuttingDown();
diff --git a/test/WorkQueue/TestSuspendableWorkQueue.cpp b/test/WorkQueue/TestSuspendableWorkQueue.cpp
index ab7f979..f469cfc 100644
--- a/test/WorkQueue/TestSuspendableWorkQueue.cpp
+++ b/test/WorkQueue/TestSuspendableWorkQueue.cpp
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE(addWork)
BOOST_CHECK(listener->addedEmptyNotice == true);
BOOST_CHECK(queue->getSize() == 1);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -213,17 +213,17 @@ BOOST_AUTO_TEST_CASE(addWorkSeq)
BOOST_CHECK(listener->emptyNotice == false);
BOOST_CHECK(queue->getSize() == 2);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
-BOOST_AUTO_TEST_CASE(shutDownException)
+BOOST_AUTO_TEST_CASE(shutdownException)
{
TestListenerPtr listener(new TestListener);
SuspendableQueuePtr queue(new SuspendableWorkQueue(listener));
- queue->shutDown();
+ queue->shutdown();
bool excepted;
try
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
try
{
- queue->shutDown();
+ queue->shutdown();
}
catch (const ShuttingDown&)
{
@@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE(appendWork)
BOOST_CHECK(listener->emptyNotice == false);
BOOST_CHECK(queue->getSize() == 2);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE(cancelWork)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -365,7 +365,7 @@ BOOST_AUTO_TEST_CASE(cancelNonExistent1)
BOOST_CHECK(listener->emptyNotice == false);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE(cancelNonExistent2)
BOOST_CHECK(excepted == false);
BOOST_CHECK(queue->getSize() == 1);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -411,7 +411,7 @@ BOOST_AUTO_TEST_CASE(simpleWorkExecution)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -427,7 +427,7 @@ BOOST_AUTO_TEST_CASE(executeNonExistent)
BOOST_CHECK(queue->getSize() == 0);
BOOST_CHECK(listener->emptyNotice == false);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -455,7 +455,7 @@ BOOST_AUTO_TEST_CASE(executionOrder1)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -507,7 +507,7 @@ BOOST_AUTO_TEST_CASE(executionOrder2)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -581,7 +581,7 @@ BOOST_AUTO_TEST_CASE(complexWork)
BOOST_CHECK(work->currentState == ComplexTask::Task2Complete);
BOOST_CHECK(listener->emptyNotice == true);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -612,7 +612,7 @@ BOOST_AUTO_TEST_CASE(racyWork)
BOOST_CHECK(queue->getSize() == 0);
BOOST_CHECK(listener->emptyNotice == true);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
diff --git a/test/WorkQueue/TestWorkQueue.cpp b/test/WorkQueue/TestWorkQueue.cpp
index 97ea1ad..50a0f9b 100644
--- a/test/WorkQueue/TestWorkQueue.cpp
+++ b/test/WorkQueue/TestWorkQueue.cpp
@@ -112,17 +112,17 @@ BOOST_AUTO_TEST_CASE(addWork)
BOOST_CHECK(listener->tasksAdded == 1);
BOOST_CHECK(queue->getSize() == 1);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
-BOOST_AUTO_TEST_CASE(shutDownException)
+BOOST_AUTO_TEST_CASE(shutdownException)
{
TestListenerPtr listener(new TestListener);
QueuePtr queue(new WorkQueue(listener));
- queue->shutDown();
+ queue->shutdown();
bool excepted;
try
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
try
{
- queue->shutDown();
+ queue->shutdown();
}
catch (const ShuttingDown&)
{
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(addWorkSeq)
BOOST_CHECK(listener->tasksAdded == 2);
BOOST_CHECK(queue->getSize() == 2);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE(appendWork)
BOOST_CHECK(listener->tasksAdded == 1);
BOOST_CHECK(queue->getSize() == 2);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE(cancelWork)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(cancelNonExistent1)
BOOST_CHECK(listener->emptyNotice == false);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -287,7 +287,7 @@ BOOST_AUTO_TEST_CASE(cancelNonExistent2)
BOOST_CHECK(queue->getSize() == 1);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -306,7 +306,7 @@ BOOST_AUTO_TEST_CASE(workExecution)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE(executeNonExistent)
BOOST_CHECK(queue->getSize() == 0);
BOOST_CHECK(listener->emptyNotice == false);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -350,7 +350,7 @@ BOOST_AUTO_TEST_CASE(executionOrder1)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
@@ -402,7 +402,7 @@ BOOST_AUTO_TEST_CASE(executionOrder2)
BOOST_CHECK(listener->emptyNotice == true);
BOOST_CHECK(queue->getSize() == 0);
- queue->shutDown();
+ queue->shutdown();
BOOST_CHECK(listener->shutdownNotice == true);
}
commit 42ebe7e6ec3a127ad6593cc40a8d07eba2e6d95c
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jun 24 16:14:07 2011 -0500
Catch ShuttingDown exceptions by const reference.
Suggested in CR-ASTSCF-98
diff --git a/test/WorkQueue/TestSuspendableWorkQueue.cpp b/test/WorkQueue/TestSuspendableWorkQueue.cpp
index 5cf376c..ab7f979 100644
--- a/test/WorkQueue/TestSuspendableWorkQueue.cpp
+++ b/test/WorkQueue/TestSuspendableWorkQueue.cpp
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->getSize();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->enqueueWork(work);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->executeWork();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->cancelWork(work);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -275,7 +275,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->setListener(listener);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->shutDown();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
diff --git a/test/WorkQueue/TestWorkQueue.cpp b/test/WorkQueue/TestWorkQueue.cpp
index 79f357d..97ea1ad 100644
--- a/test/WorkQueue/TestWorkQueue.cpp
+++ b/test/WorkQueue/TestWorkQueue.cpp
@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->getSize();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->enqueueWork(work);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->executeWork();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->cancelWork(work);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->setListener(listener);
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(shutDownException)
{
queue->shutDown();
}
- catch (ShuttingDown)
+ catch (const ShuttingDown&)
{
excepted = true;
}
commit 77fbd062c219503ed3735918d4c2346a5b9a9d4b
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Jun 24 14:58:45 2011 -0500
Make final adjustments based on comments in CR-ASTSCF-83
diff --git a/src/ThreadPool/ThreadPool.cpp b/src/ThreadPool/ThreadPool.cpp
index ac9aff3..f85ed1c 100644
--- a/src/ThreadPool/ThreadPool.cpp
+++ b/src/ThreadPool/ThreadPool.cpp
@@ -144,15 +144,12 @@ public:
WorkerThreadPtr mWorkerThread;
};
- typedef IceUtil::Handle<ActiveThreadIdle> ActiveThreadIdlePtr;
-
void activeThreadIdle(WorkerThreadPtr thread)
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
if (!mShuttingDown)
{
- ActiveThreadIdlePtr task(new ActiveThreadIdle(thread, this));
- mControlQueue->enqueueWork(task);
+ mControlQueue->enqueueWork(new ActiveThreadIdle(thread, this));
}
}
@@ -184,15 +181,12 @@ public:
WorkerThreadPtr mWorkerThread;
};
- typedef IceUtil::Handle<ZombieThreadDead> ZombieThreadDeadPtr;
-
void zombieThreadDead(WorkerThreadPtr thread)
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
if (!mShuttingDown)
{
- ZombieThreadDeadPtr task(new ZombieThreadDead(thread, this));
- mControlQueue->enqueueWork(task);
+ mControlQueue->enqueueWork(new ZombieThreadDead(thread, this));
}
}
@@ -285,15 +279,12 @@ public:
ThreadPool *mPriv;
};
- typedef IceUtil::Handle<Resize> ResizePtr;
-
void resize(int numThreads)
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
if (!mShuttingDown)
{
- ResizePtr task(new Resize(numThreads, this));
- mControlQueue->enqueueWork(task);
+ mControlQueue->enqueueWork(new Resize(numThreads, this));
}
}
@@ -330,15 +321,13 @@ public:
ThreadPool *mPool;
};
- typedef IceUtil::Handle<WorkAdded> WorkAddedPtr;
void handleWorkAdded(Ice::Long numNewWork, bool wasEmpty)
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
if (!mShuttingDown)
{
- WorkAddedPtr task(new WorkAdded(numNewWork, wasEmpty, this));
- mControlQueue->enqueueWork(task);
+ mControlQueue->enqueueWork(new WorkAdded(numNewWork, wasEmpty, this));
}
}
@@ -362,15 +351,12 @@ public:
ThreadPool *mPool;
};
- typedef IceUtil::Handle<Emptied> EmptiedPtr;
-
void handleEmptied()
{
boost::lock_guard<boost::mutex> lock(mQueueLock);
if (!mShuttingDown)
{
- EmptiedPtr task(new Emptied(this));
- mControlQueue->enqueueWork(task);
+ mControlQueue->enqueueWork(new Emptied(this));
}
}
diff --git a/src/WorkQueue/SuspendableWorkQueue.cpp b/src/WorkQueue/SuspendableWorkQueue.cpp
index 771adc0..c0cafde 100644
--- a/src/WorkQueue/SuspendableWorkQueue.cpp
+++ b/src/WorkQueue/SuspendableWorkQueue.cpp
@@ -205,7 +205,7 @@ public:
}
// If the workResumable notification is received and the
- // state of things was not suspended, then that must mean
+ // Queue was not in the Suspended state, then that must mean
// that suspended work completed and this listener was notified
// before the queue could move past the step of executing
// work and on to the step of marking the work as Suspended.
commit 61a9e819013d5861e6095f8668999645a563f599
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 23 13:24:46 2011 -0500
Provide a real path to astscf_slice_collection().
There is at least one version of CMake that has a different 'current directory'
when astscf_slice_collection() is executed than these scripts expect... so
instead, pass a complete path to that function so the current directory won't
matter.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ef44216..160f2f7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
astscf_component_init(astscf-ice-util-cpp-test)
-astscf_slice_collection(LOCAL PATH .)
+astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}")
astscf_component_add_slices(astscf-ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 62758f2..7e6583d 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,5 +1,5 @@
astscf_component_init(StateReplicatorTest)
-astscf_slice_collection(LOCAL PATH slice)
+astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}/slice")
astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
astscf_component_add_files(StateReplicatorTest SharedTestData.h)
astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)
commit 56b528b14638e626592bbe740f1086e96bfe6aef
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:46:51 2011 -0500
Rely on automatic inclusion of project's 'include' directory.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index accf48d..4a9c45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,6 @@ astscf_project(astscf-ice-util-cpp 3.4)
set(astscf-ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
-include_directories(include)
include_directories(${logger_dir}/include)
add_subdirectory(src)
commit 8039a9686285c955e99623bfb50d51af15fb4340
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:54:34 2011 -0500
Add 'astscf' prefix to library name.
In order to ensure that Asterisk SCF libraries do not conflict with others
when installed, each library should have an 'astscf' prefix.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56c7240..accf48d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
-astscf_project(ice-util-cpp 3.4)
+astscf_project(astscf-ice-util-cpp 3.4)
-set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+set(astscf-ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${logger_dir}/include)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44cfc4b..082821e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,12 @@
-astscf_component_init(ice-util-cpp)
+astscf_component_init(astscf-ice-util-cpp)
file(GLOB_RECURSE project_headers ../include/*.h)
-astscf_component_add_files(ice-util-cpp ${project_headers})
+astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
add_subdirectory(CollocatedIceStorm)
add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
-astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
-astscf_component_add_slice_collection_libraries(ice-util-cpp ASTSCF)
-astscf_component_build_library(ice-util-cpp)
-target_link_libraries(ice-util-cpp logging-client)
-astscf_component_install(ice-util-cpp)
+astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
+astscf_component_build_library(astscf-ice-util-cpp)
+target_link_libraries(astscf-ice-util-cpp logging-client)
+astscf_component_install(astscf-ice-util-cpp)
diff --git a/src/CollocatedIceStorm/CMakeLists.txt b/src/CollocatedIceStorm/CMakeLists.txt
index 7faa392..668f756 100644
--- a/src/CollocatedIceStorm/CMakeLists.txt
+++ b/src/CollocatedIceStorm/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(ice-util-cpp CollocatedIceStorm.cpp)
+astscf_component_add_files(astscf-ice-util-cpp CollocatedIceStorm.cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index e8fdad5..f16403e 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_files(ice-util-cpp ThreadPool.cpp)
-astscf_component_add_files(ice-util-cpp WorkerThread.cpp)
+astscf_component_add_files(astscf-ice-util-cpp ThreadPool.cpp)
+astscf_component_add_files(astscf-ice-util-cpp WorkerThread.cpp)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index 70fbe2c..a016def 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,3 +1,3 @@
-astscf_component_add_files(ice-util-cpp WorkQueue.cpp)
-astscf_component_add_files(ice-util-cpp SuspendableWorkQueue.cpp)
-astscf_component_add_files(ice-util-cpp DefaultQueueListener.cpp)
+astscf_component_add_files(astscf-ice-util-cpp WorkQueue.cpp)
+astscf_component_add_files(astscf-ice-util-cpp SuspendableWorkQueue.cpp)
+astscf_component_add_files(astscf-ice-util-cpp DefaultQueueListener.cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d4784bc..ef44216 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,18 +1,18 @@
-astscf_component_init(ice-util-cpp-test)
+astscf_component_init(astscf-ice-util-cpp-test)
astscf_slice_collection(LOCAL PATH .)
-astscf_component_add_slices(ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
-astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
-astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
-astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
-astscf_component_add_slice_collection_libraries(ice-util-cpp-test ASTSCF)
-astscf_component_build_icebox(ice-util-cpp-test)
-astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
+astscf_component_add_slices(astscf-ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
+astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_files(astscf-ice-util-cpp-test UtilityTests.cpp)
+astscf_component_add_ice_libraries(astscf-ice-util-cpp-test IceBox)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp-test ASTSCF)
+astscf_component_build_icebox(astscf-ice-util-cpp-test)
+astscf_test_icebox(astscf-ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
add_subdirectory(Replication)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index e20835b..949333e 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -4,5 +4,5 @@ astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
astscf_component_add_slice_collection_libraries(ThreadPoolTest ASTSCF)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest ice-util-cpp)
+target_link_libraries(ThreadPoolTest astscf-ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 5b37d9f..9a7abb5 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -4,7 +4,7 @@ astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
astscf_component_add_slice_collection_libraries(WorkQueueTest ASTSCF)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest ice-util-cpp)
+target_link_libraries(WorkQueueTest astscf-ice-util-cpp)
astscf_test_boost(WorkQueueTest)
astscf_component_init(SuspendableWorkQueueTest)
@@ -13,5 +13,5 @@ astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
astscf_component_add_slice_collection_libraries(SuspendableWorkQueueTest ASTSCF)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
+target_link_libraries(SuspendableWorkQueueTest astscf-ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit dca005359d6ebef1ec64a22cd27b6c98dce34fbd
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97f4a13..56c7240 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ astscf_project(ice-util-cpp 3.4)
set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
-include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52679ea..44cfc4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
+astscf_component_add_slice_collection_libraries(ice-util-cpp ASTSCF)
astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
-target_link_libraries(ice-util-cpp astscf-api)
astscf_component_install(ice-util-cpp)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1a9c251..d4784bc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_component_init(ice-util-cpp-test)
-astscf_slice_collection(local .)
-astscf_component_add_slices(ice-util-cpp-test local ProxyHelper/SimpleIf.ice)
+astscf_slice_collection(LOCAL PATH .)
+astscf_component_add_slices(ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
@@ -10,8 +10,8 @@ astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_add_slice_collection_libraries(ice-util-cpp-test ASTSCF)
astscf_component_build_icebox(ice-util-cpp-test)
-target_link_libraries(ice-util-cpp-test astscf-api)
astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 5eefb35..62758f2 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,9 +1,9 @@
astscf_component_init(StateReplicatorTest)
-astscf_slice_collection(local slice)
+astscf_slice_collection(LOCAL PATH slice)
astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
astscf_component_add_files(StateReplicatorTest SharedTestData.h)
astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)
-astscf_component_add_slices(StateReplicatorTest local StateReplicatorTestIf.ice)
+astscf_component_add_slices(StateReplicatorTest LOCAL StateReplicatorTestIf.ice)
astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
astscf_component_build_standalone(StateReplicatorTest)
astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index eb02604..e20835b 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -2,7 +2,7 @@ astscf_component_init(ThreadPoolTest)
astscf_component_add_files(ThreadPoolTest TestThreadPool.cpp)
astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(ThreadPoolTest ASTSCF)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest astscf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 9585e85..5b37d9f 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -2,8 +2,8 @@ astscf_component_init(WorkQueueTest)
astscf_component_add_files(WorkQueueTest TestWorkQueue.cpp)
astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
+astscf_component_add_slice_collection_libraries(WorkQueueTest ASTSCF)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest astscf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
astscf_test_boost(WorkQueueTest)
@@ -11,7 +11,7 @@ astscf_component_init(SuspendableWorkQueueTest)
astscf_component_add_files(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
+astscf_component_add_slice_collection_libraries(SuspendableWorkQueueTest ASTSCF)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest astscf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit a215b14cccc535c3e770bc9af4760979b8d68e28
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c710520..97f4a13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
-astscf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
if(BUILD_TESTING)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b60669..52679ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,38 +1,12 @@
-# Ice Utilities for C++
-
astscf_component_init(ice-util-cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
-astscf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
-astscf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
-astscf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
-astscf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
-astscf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
-astscf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
-#
-# Note, strictly speaking this isn't for component development, but as it is part of this
-# library it sort of belongs here.
-#
-astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
-astscf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
-astscf_component_add_ice_libraries(ice-util-cpp IceStorm)
-astscf_component_add_ice_libraries(ice-util-cpp IceBox)
+file(GLOB_RECURSE project_headers ../include/*.h)
+astscf_component_add_files(ice-util-cpp ${project_headers})
+add_subdirectory(CollocatedIceStorm)
+add_subdirectory(WorkQueue)
+add_subdirectory(ThreadPool)
+astscf_component_add_ice_libraries(ice-util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
-target_link_libraries(ice-util-cpp asterisk-scf-api)
+target_link_libraries(ice-util-cpp astscf-api)
astscf_component_install(ice-util-cpp)
-
diff --git a/src/CollocatedIceStorm/CMakeLists.txt b/src/CollocatedIceStorm/CMakeLists.txt
new file mode 100644
index 0000000..7faa392
--- /dev/null
+++ b/src/CollocatedIceStorm/CMakeLists.txt
@@ -0,0 +1 @@
+astscf_component_add_files(ice-util-cpp CollocatedIceStorm.cpp)
diff --git a/src/IceUtilCpp.cpp b/src/IceUtilCpp.cpp
deleted file mode 100644
index d05edd5..0000000
--- a/src/IceUtilCpp.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Asterisk SCF -- An open-source communications framework.
- *
- * Copyright (C) 2010, Digium, Inc.
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk SCF project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE.txt file
- * at the top of the source tree.
- */
-#include <Ice/Ice.h>
-#include <AsteriskSCF/Utilities.h>
-
-//
-// This .cpp is a temporary solution to get a CMakeProject that consists only of header files.
-//
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index 476e3dd..e8fdad5 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,10 +1,2 @@
-astscf_component_init(ThreadPool)
-astscf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
-astscf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
-astscf_component_add_file(ThreadPool ThreadPool.cpp)
-astscf_component_add_file(ThreadPool WorkerThread.cpp)
-astscf_component_add_boost_libraries(ThreadPool thread date_time)
-astscf_component_build_library(ThreadPool)
-target_link_libraries(ThreadPool WorkQueue)
-target_link_libraries(ThreadPool asterisk-scf-api)
-astscf_component_install(ThreadPool)
+astscf_component_add_files(ice-util-cpp ThreadPool.cpp)
+astscf_component_add_files(ice-util-cpp WorkerThread.cpp)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index a80baa4..70fbe2c 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,11 +1,3 @@
-astscf_component_init(WorkQueue)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
-astscf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
-astscf_component_add_file(WorkQueue WorkQueue.cpp)
-astscf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
-astscf_component_add_file(WorkQueue DefaultQueueListener.cpp)
-astscf_component_add_boost_libraries(WorkQueue thread date_time)
-astscf_component_build_library(WorkQueue)
-target_link_libraries(WorkQueue asterisk-scf-api)
-astscf_component_install(WorkQueue)
+astscf_component_add_files(ice-util-cpp WorkQueue.cpp)
+astscf_component_add_files(ice-util-cpp SuspendableWorkQueue.cpp)
+astscf_component_add_files(ice-util-cpp DefaultQueueListener.cpp)
diff --git a/test/Async/CMakeLists.txt b/test/Async/CMakeLists.txt
index d61ae7d..9367567 100644
--- a/test/Async/CMakeLists.txt
+++ b/test/Async/CMakeLists.txt
@@ -1,8 +1,8 @@
astscf_component_init(ami-collector-test)
-astscf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
-astscf_component_add_file(ami-collector-test IceIntegration-test.cpp)
-astscf_component_add_file(ami-collector-test TestAmiCollector.h)
-astscf_component_add_file(ami-collector-test test.cpp)
+astscf_component_add_files(ami-collector-test ResponseCollector-test.cpp)
+astscf_component_add_files(ami-collector-test IceIntegration-test.cpp)
+astscf_component_add_files(ami-collector-test TestAmiCollector.h)
+astscf_component_add_files(ami-collector-test test.cpp)
astscf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
astscf_component_build_standalone(ami-collector-test)
astscf_test_boost(ami-collector-test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 084a866..1a9c251 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,16 +1,18 @@
astscf_component_init(ice-util-cpp-test)
-astscf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
-astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-astscf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
+astscf_slice_collection(local .)
+astscf_component_add_slices(ice-util-cpp-test local ProxyHelper/SimpleIf.ice)
+astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_files(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_files(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_files(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_files(ice-util-cpp-test UtilityTests.cpp)
astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
astscf_component_build_icebox(ice-util-cpp-test)
-target_link_libraries(ice-util-cpp-test asterisk-scf-api)
+target_link_libraries(ice-util-cpp-test astscf-api)
+astscf_test_icebox(ice-util-cpp-test IceUtilCppTests.conf)
add_subdirectory(Async)
add_subdirectory(Replication)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 1abce94..5eefb35 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,8 +1,9 @@
astscf_component_init(StateReplicatorTest)
-astscf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
-astscf_component_add_file(StateReplicatorTest SharedTestData.h)
-astscf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
-astscf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
+astscf_slice_collection(local slice)
+astscf_component_add_files(StateReplicatorTest TestStateReplicator.cpp)
+astscf_component_add_files(StateReplicatorTest SharedTestData.h)
+astscf_component_add_files(StateReplicatorTest MockStateReplicatorListener.h)
+astscf_component_add_slices(StateReplicatorTest local StateReplicatorTestIf.ice)
astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
astscf_component_build_standalone(StateReplicatorTest)
astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index 6f7015c..eb02604 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -1,8 +1,8 @@
astscf_component_init(ThreadPoolTest)
-astscf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
-astscf_component_add_file(ThreadPoolTest test.cpp)
+astscf_component_add_files(ThreadPoolTest TestThreadPool.cpp)
+astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest asterisk-scf-api)
+target_link_libraries(ThreadPoolTest astscf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index cb4769b..9585e85 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -1,17 +1,17 @@
astscf_component_init(WorkQueueTest)
-astscf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
-astscf_component_add_file(WorkQueueTest test.cpp)
+astscf_component_add_files(WorkQueueTest TestWorkQueue.cpp)
+astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest asterisk-scf-api)
+target_link_libraries(WorkQueueTest astscf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
astscf_test_boost(WorkQueueTest)
astscf_component_init(SuspendableWorkQueueTest)
-astscf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
-astscf_component_add_file(SuspendableWorkQueueTest test2.cpp)
+astscf_component_add_files(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
+astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
+target_link_libraries(SuspendableWorkQueueTest astscf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit 4c7d07abae76081c71d2c3e3ba12be0366916aed
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 3 15:20:33 2011 -0500
Accommodate change from ASTERISK_SCF_ICEBOX_EXPORT to ASTSCF_DLL_EXPORT.
diff --git a/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h b/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
index 02ea2b4..4cac3e1 100644
--- a/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
+++ b/include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h
@@ -32,7 +32,7 @@ namespace CollocatedIceStorm
* a separate process to access IceStorm services.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT CollocatedIceStorm : public IceUtil::Shared
+class ASTSCF_DLL_EXPORT CollocatedIceStorm : public IceUtil::Shared
{
public:
CollocatedIceStorm(const std::string&, const Ice::PropertiesPtr&);
diff --git a/include/AsteriskSCF/Testing/IceBoxBoostTest.h b/include/AsteriskSCF/Testing/IceBoxBoostTest.h
index 8819dc3..8e39521 100644
--- a/include/AsteriskSCF/Testing/IceBoxBoostTest.h
+++ b/include/AsteriskSCF/Testing/IceBoxBoostTest.h
@@ -78,7 +78,7 @@ public:
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new IceBoxTest;
}
diff --git a/include/AsteriskSCF/ThreadPool/ThreadPool.h b/include/AsteriskSCF/ThreadPool/ThreadPool.h
index 47e9527..93846c0 100644
--- a/include/AsteriskSCF/ThreadPool/ThreadPool.h
+++ b/include/AsteriskSCF/ThreadPool/ThreadPool.h
@@ -48,7 +48,7 @@ public:
* For more information on these methods, see
* AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
*/
-class ASTERISK_SCF_ICEBOX_EXPORT ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
+class ASTSCF_DLL_EXPORT ThreadPoolFactory : public AsteriskSCF::System::ThreadPool::V1::PoolFactory
{
public:
ThreadPoolFactory();
diff --git a/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h b/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
index 01b4090..5d01d78 100644
--- a/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
+++ b/include/AsteriskSCF/WorkQueue/DefaultQueueListener.h
@@ -40,7 +40,7 @@ class DefaultQueueListenerPriv;
* as a matter of convenience.
*/
-class ASTERISK_SCF_ICEBOX_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
+class ASTSCF_DLL_EXPORT DefaultQueueListener : public AsteriskSCF::System::WorkQueue::V1::QueueListener
{
public:
DefaultQueueListener(const AsteriskSCF::System::WorkQueue::V1::QueuePtr& queue);
diff --git a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
index d2b79be..046b5cf 100644
--- a/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h
@@ -27,7 +27,7 @@ namespace WorkQueue
class SuspendableWorkQueuePriv;
-class ASTERISK_SCF_ICEBOX_EXPORT SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
+class ASTSCF_DLL_EXPORT SuspendableWorkQueue : public AsteriskSCF::System::WorkQueue::V1::SuspendableQueue
{
public:
SuspendableWorkQueue();
diff --git a/include/AsteriskSCF/WorkQueue/WorkQueue.h b/include/AsteriskSCF/WorkQueue/WorkQueue.h
index 0365537..598ef18 100644
--- a/include/AsteriskSCF/WorkQueue/WorkQueue.h
+++ b/include/AsteriskSCF/WorkQueue/WorkQueue.h
@@ -26,7 +26,7 @@ namespace WorkQueue
class WorkQueuePriv;
-class ASTERISK_SCF_ICEBOX_EXPORT WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
+class ASTSCF_DLL_EXPORT WorkQueue : public AsteriskSCF::System::WorkQueue::V1::Queue
{
public:
WorkQueue();
diff --git a/src/CollocatedIceStorm/CollocatedIceStorm.cpp b/src/CollocatedIceStorm/CollocatedIceStorm.cpp
index e3fe6c2..cd37418 100644
--- a/src/CollocatedIceStorm/CollocatedIceStorm.cpp
+++ b/src/CollocatedIceStorm/CollocatedIceStorm.cpp
@@ -69,7 +69,7 @@ CollocatedIceStorm::~CollocatedIceStorm()
}
}
-ASTERISK_SCF_ICEBOX_EXPORT void CollocatedIceStorm::stop()
+ASTSCF_DLL_EXPORT void CollocatedIceStorm::stop()
{
//
// NOTE: there isn't any mutex protection here. It can be added later if needed, but at the moment multiple threads
diff --git a/test/UtilityTests.cpp b/test/UtilityTests.cpp
index 1ce10c8..b3bf3ec 100644
--- a/test/UtilityTests.cpp
+++ b/test/UtilityTests.cpp
@@ -127,7 +127,7 @@ public:
extern "C"
{
-ASTERISK_SCF_ICEBOX_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
+ASTSCF_DLL_EXPORT IceBox::Service* create(Ice::CommunicatorPtr)
{
return new AsteriskSCF::UtilityTests::TestService;
}
commit 2fcfaefe97cb6410798a8f953d1d0e8d3bc86c84
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4973497..c710520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_project(ice-util-cpp 3.4)
+astscf_project(ice-util-cpp 3.4)
set(ice-util-cpp_dir ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
include_directories(include)
include_directories(${API_INCLUDE_DIR})
include_directories(${logger_dir}/include)
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+astscf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(test)
endif()
-asterisk_scf_headers_install(include/)
+astscf_headers_install(include/)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c6cc0d8..6b60669 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,38 +1,38 @@
# Ice Utilities for C++
-asterisk_scf_component_init(ice-util-cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
-asterisk_scf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
-asterisk_scf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
+astscf_component_init(ice-util-cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/WorkQueue.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/SuspendableWorkQueue.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/WorkQueue/DefaultQueueListener.h)
+astscf_component_add_file(ice-util-cpp WorkQueue/WorkQueue.cpp)
+astscf_component_add_file(ice-util-cpp WorkQueue/SuspendableWorkQueue.cpp)
+astscf_component_add_file(ice-util-cpp WorkQueue/DefaultQueueListener.cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/ThreadPool.h)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/ThreadPool/WorkerThread.h)
+astscf_component_add_file(ice-util-cpp ThreadPool/ThreadPool.cpp)
+astscf_component_add_file(ice-util-cpp ThreadPool/WorkerThread.cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h)
+astscf_component_add_file(ice-util-cpp CollocatedIceStorm/CollocatedIceStorm.cpp)
#
# Note, strictly speaking this isn't for component development, but as it is part of this
# library it sort of belongs here.
#
-asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
-asterisk_scf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp IceStorm)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp IceBox)
-asterisk_scf_component_add_boost_libraries(ice-util-cpp core thread date_time)
-asterisk_scf_component_build_library(ice-util-cpp)
+astscf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
+astscf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
+astscf_component_add_ice_libraries(ice-util-cpp IceStorm)
+astscf_component_add_ice_libraries(ice-util-cpp IceBox)
+astscf_component_add_boost_libraries(ice-util-cpp core thread date_time)
+astscf_component_build_library(ice-util-cpp)
target_link_libraries(ice-util-cpp logging-client)
target_link_libraries(ice-util-cpp asterisk-scf-api)
-asterisk_scf_component_install(ice-util-cpp)
+astscf_component_install(ice-util-cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index f20e468..476e3dd 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,10 +1,10 @@
-asterisk_scf_component_init(ThreadPool)
-asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
-asterisk_scf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
-asterisk_scf_component_add_file(ThreadPool ThreadPool.cpp)
-asterisk_scf_component_add_file(ThreadPool WorkerThread.cpp)
-asterisk_scf_component_add_boost_libraries(ThreadPool thread date_time)
-asterisk_scf_component_build_library(ThreadPool)
+astscf_component_init(ThreadPool)
+astscf_component_add_file(ThreadPool ../include/AsteriskSCF/ThreadPool.h)
+astscf_component_add_file(ThreadPool ../include/AsteriskSCF/WorkerThread.h)
+astscf_component_add_file(ThreadPool ThreadPool.cpp)
+astscf_component_add_file(ThreadPool WorkerThread.cpp)
+astscf_component_add_boost_libraries(ThreadPool thread date_time)
+astscf_component_build_library(ThreadPool)
target_link_libraries(ThreadPool WorkQueue)
target_link_libraries(ThreadPool asterisk-scf-api)
-asterisk_scf_component_install(ThreadPool)
+astscf_component_install(ThreadPool)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index 6ca491d..a80baa4 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,11 +1,11 @@
-asterisk_scf_component_init(WorkQueue)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
-asterisk_scf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
-asterisk_scf_component_add_file(WorkQueue WorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueue DefaultQueueListener.cpp)
-asterisk_scf_component_add_boost_libraries(WorkQueue thread date_time)
-asterisk_scf_component_build_library(WorkQueue)
+astscf_component_init(WorkQueue)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/WorkQueue.h)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/SuspendableWorkQueue.h)
+astscf_component_add_file(WorkQueue ../include/AsteriskSCF/DefaultQueueListener.h)
+astscf_component_add_file(WorkQueue WorkQueue.cpp)
+astscf_component_add_file(WorkQueue SuspendableWorkQueue.cpp)
+astscf_component_add_file(WorkQueue DefaultQueueListener.cpp)
+astscf_component_add_boost_libraries(WorkQueue thread date_time)
+astscf_component_build_library(WorkQueue)
target_link_libraries(WorkQueue asterisk-scf-api)
-asterisk_scf_component_install(WorkQueue)
+astscf_component_install(WorkQueue)
diff --git a/test/Async/CMakeLists.txt b/test/Async/CMakeLists.txt
index 5477439..d61ae7d 100644
--- a/test/Async/CMakeLists.txt
+++ b/test/Async/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(ami-collector-test)
-asterisk_scf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
-asterisk_scf_component_add_file(ami-collector-test IceIntegration-test.cpp)
-asterisk_scf_component_add_file(ami-collector-test TestAmiCollector.h)
-asterisk_scf_component_add_file(ami-collector-test test.cpp)
-asterisk_scf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
-asterisk_scf_component_build_standalone(ami-collector-test)
-asterisk_scf_test_boost(ami-collector-test)
+astscf_component_init(ami-collector-test)
+astscf_component_add_file(ami-collector-test ResponseCollector-test.cpp)
+astscf_component_add_file(ami-collector-test IceIntegration-test.cpp)
+astscf_component_add_file(ami-collector-test TestAmiCollector.h)
+astscf_component_add_file(ami-collector-test test.cpp)
+astscf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
+astscf_component_build_standalone(ami-collector-test)
+astscf_test_boost(ami-collector-test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b26ab49..084a866 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_component_init(ice-util-cpp-test)
-asterisk_scf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
-asterisk_scf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-asterisk_scf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-asterisk_scf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-asterisk_scf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-asterisk_scf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
-asterisk_scf_component_add_ice_libraries(ice-util-cpp-test IceBox)
-asterisk_scf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
-asterisk_scf_component_build_icebox(ice-util-cpp-test)
+astscf_component_init(ice-util-cpp-test)
+astscf_component_add_slice(ice-util-cpp-test ProxyHelper/SimpleIf.ice)
+astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_file(ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_file(ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_file(ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
+astscf_component_add_ice_libraries(ice-util-cpp-test IceBox)
+astscf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
+astscf_component_build_icebox(ice-util-cpp-test)
target_link_libraries(ice-util-cpp-test asterisk-scf-api)
add_subdirectory(Async)
diff --git a/test/Replication/CMakeLists.txt b/test/Replication/CMakeLists.txt
index 829e50d..1abce94 100644
--- a/test/Replication/CMakeLists.txt
+++ b/test/Replication/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(StateReplicatorTest)
-asterisk_scf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
-asterisk_scf_component_add_file(StateReplicatorTest SharedTestData.h)
-asterisk_scf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
-asterisk_scf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
-asterisk_scf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
-asterisk_scf_component_build_standalone(StateReplicatorTest)
-asterisk_scf_test_boost(StateReplicatorTest)
+astscf_component_init(StateReplicatorTest)
+astscf_component_add_file(StateReplicatorTest TestStateReplicator.cpp)
+astscf_component_add_file(StateReplicatorTest SharedTestData.h)
+astscf_component_add_file(StateReplicatorTest MockStateReplicatorListener.h)
+astscf_component_add_slice(StateReplicatorTest ./slice/StateReplicatorTestIf.ice)
+astscf_component_add_boost_libraries(StateReplicatorTest unit_test_framework thread date_time)
+astscf_component_build_standalone(StateReplicatorTest)
+astscf_test_boost(StateReplicatorTest)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index ec1a786..6f7015c 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -1,8 +1,8 @@
-asterisk_scf_component_init(ThreadPoolTest)
-asterisk_scf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
-asterisk_scf_component_add_file(ThreadPoolTest test.cpp)
-asterisk_scf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
-asterisk_scf_component_build_standalone(ThreadPoolTest)
+astscf_component_init(ThreadPoolTest)
+astscf_component_add_file(ThreadPoolTest TestThreadPool.cpp)
+astscf_component_add_file(ThreadPoolTest test.cpp)
+astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
+astscf_component_build_standalone(ThreadPoolTest)
target_link_libraries(ThreadPoolTest asterisk-scf-api)
target_link_libraries(ThreadPoolTest ice-util-cpp)
-asterisk_scf_test_boost(ThreadPoolTest)
+astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index c0006f4..cb4769b 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -1,17 +1,17 @@
-asterisk_scf_component_init(WorkQueueTest)
-asterisk_scf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
-asterisk_scf_component_add_file(WorkQueueTest test.cpp)
-asterisk_scf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
-asterisk_scf_component_build_standalone(WorkQueueTest)
+astscf_component_init(WorkQueueTest)
+astscf_component_add_file(WorkQueueTest TestWorkQueue.cpp)
+astscf_component_add_file(WorkQueueTest test.cpp)
+astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
+astscf_component_build_standalone(WorkQueueTest)
target_link_libraries(WorkQueueTest asterisk-scf-api)
target_link_libraries(WorkQueueTest ice-util-cpp)
-asterisk_scf_test_boost(WorkQueueTest)
+astscf_test_boost(WorkQueueTest)
-asterisk_scf_component_init(SuspendableWorkQueueTest)
-asterisk_scf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
-asterisk_scf_component_add_file(SuspendableWorkQueueTest test2.cpp)
-asterisk_scf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
-asterisk_scf_component_build_standalone(SuspendableWorkQueueTest)
+astscf_component_init(SuspendableWorkQueueTest)
+astscf_component_add_file(SuspendableWorkQueueTest TestSuspendableWorkQueue.cpp)
+astscf_component_add_file(SuspendableWorkQueueTest test2.cpp)
+astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
+astscf_component_build_standalone(SuspendableWorkQueueTest)
target_link_libraries(SuspendableWorkQueueTest asterisk-scf-api)
target_link_libraries(SuspendableWorkQueueTest ice-util-cpp)
-asterisk_scf_test_boost(SuspendableWorkQueueTest)
+astscf_test_boost(SuspendableWorkQueueTest)
commit a2ce516dc00012b7af5ce5e2b33880ea07d219cb
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 16:04:55 2011 -0500
Allow user to disable building of tests.
The CTest module offers a BUILD_TESTING option; if the user turns this option
off, we shouldn't bother building any of our tests.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3690011..4973497 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@ include_directories(${logger_dir}/include)
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
add_subdirectory(src)
-add_subdirectory(test)
+if(BUILD_TESTING)
+ add_subdirectory(test)
+endif()
asterisk_scf_headers_install(include/)
commit 6da01131aef4cb6b009514adbd3acfefcbcfd5a7
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Jun 6 16:48:55 2011 -0500
Add appropriate changes based on changes to QueueListener
diff --git a/src/WorkQueue/DefaultQueueListener.cpp b/src/WorkQueue/DefaultQueueListener.cpp
index 82490b3..f191c17 100644
--- a/src/WorkQueue/DefaultQueueListener.cpp
+++ b/src/WorkQueue/DefaultQueueListener.cpp
@@ -90,6 +90,15 @@ public:
DefaultQueueListener::DefaultQueueListener(const QueueBasePtr& queue)
: mPriv(new DefaultQueueListenerPriv(queue)) { }
+DefaultQueueListener::~DefaultQueueListener()
+{
+ if (!mPriv->mIsShutdown)
+ {
+ mPriv->setDead(true);
+ mPriv->mThread.join();
+ }
+}
+
void DefaultQueueListener::workAdded(const QueueBasePtr&, Ice::Long, bool wasEmpty)
{
if (wasEmpty)
diff --git a/test/WorkQueue/TestSuspendableWorkQueue.cpp b/test/WorkQueue/TestSuspendableWorkQueue.cpp
index 176b48f..5cf376c 100644
--- a/test/WorkQueue/TestSuspendableWorkQueue.cpp
+++ b/test/WorkQueue/TestSuspendableWorkQueue.cpp
@@ -32,25 +32,25 @@ public:
resumableNotice(false),
shutdownNotice(false) { }
- void workAdded(Ice::Long, bool wasEmpty)
+ void workAdded(const QueueBasePtr&, Ice::Long, bool wasEmpty)
{
addedNotice = true;
addedEmptyNotice = wasEmpty;
}
- void emptied()
+ void emptied(const QueueBasePtr&)
{
emptyNotice = true;
}
- void workResumable()
+ void workResumable(const QueueBasePtr&)
{
boost::unique_lock<boost::mutex> lock(mLock);
resumableNotice = true;
mCond.notify_one();
}
- void shuttingDown()
+ void shuttingDown(const QueueBasePtr&)
{
shutdownNotice = true;
}
diff --git a/test/WorkQueue/TestWorkQueue.cpp b/test/WorkQueue/TestWorkQueue.cpp
index 3f60bb4..79f357d 100644
--- a/test/WorkQueue/TestWorkQueue.cpp
+++ b/test/WorkQueue/TestWorkQueue.cpp
@@ -31,24 +31,24 @@ public:
addedEmptyNotice(false),
emptyNotice(false), shutdownNotice(false) { }
- void workAdded(Ice::Long numNewWork, bool wasEmpty)
+ void workAdded(const QueueBasePtr&, Ice::Long numNewWork, bool wasEmpty)
{
addedNotice = true;
addedEmptyNotice = wasEmpty;
tasksAdded = numNewWork;
}
- void emptied()
+ void emptied(const QueueBasePtr&)
{
emptyNotice = true;
}
- void workResumable()
+ void workResumable(const QueueBasePtr&)
{
BOOST_FAIL("workResumable called from a Queue?!");
}
... 1159 lines suppressed ...
--
asterisk-scf/integration/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list