From c5e8c6603c99a264862cc799029b9a7c2f44e75b Mon Sep 17 00:00:00 2001 From: timoore Date: Wed, 10 Dec 2008 22:39:02 +0000 Subject: [PATCH] Use Boost singleton template for our singletons --- acinclude.m4 | 224 +++++++++++++++++++ configure.ac | 15 ++ simgear/scene/model/ModelRegistry.cxx | 12 +- simgear/scene/model/ModelRegistry.hxx | 8 +- simgear/scene/sky/newcloud.cxx | 2 + simgear/scene/tgdb/GroundLightManager.cxx | 6 - simgear/scene/tgdb/GroundLightManager.hxx | 6 +- simgear/scene/util/StateAttributeFactory.cxx | 21 +- simgear/scene/util/StateAttributeFactory.hxx | 27 ++- simgear/structure/Makefile.am | 3 +- simgear/structure/Singleton.hxx | 58 +++++ 11 files changed, 333 insertions(+), 49 deletions(-) create mode 100644 simgear/structure/Singleton.hxx diff --git a/acinclude.m4 b/acinclude.m4 index cf74b133..af9004cb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -460,3 +460,227 @@ pushdef([AC_PROG_INSTALL], INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)' INSTALL_SCRIPT='${INSTALL}' ])dnl + +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_boost_base.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_BASE([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# Test for the Boost C++ libraries of a particular version (or newer) +# +# If no path to the installed boost library is given the macro searchs +# under /usr, /usr/local, /opt and /opt/local and evaluates the +# $BOOST_ROOT environment variable. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) +# +# And sets: +# +# HAVE_BOOST +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +AC_DEFUN([AX_BOOST_BASE], +[ +AC_ARG_WITH([boost], + AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is yes) - it is possible to specify the root directory for boost (optional)]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" + fi + ], + [want_boost="yes"]) + + +AC_ARG_WITH([boost-libdir], + AS_HELP_STRING([--with-boost-libdir=LIB_DIR], + [Force given directory for boost libraries. Note that this will overwrite library path detection, so use this parameter only if default library detection fails and you know exactly where your boost libraries are located.]), + [ + if test -d $withval + then + ac_boost_lib_path="$withval" + else + AC_MSG_ERROR(--with-boost-libdir expected directory name) + fi + ], + [ac_boost_lib_path=""] +) + +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=ifelse([$1], ,1.20.0,$1) + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) + succeeded=no + + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl or if you install boost with RPM + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + + dnl overwrite ld flags if we have required special directory with + dnl --with-boost-libdir parameter + if test "$ac_boost_lib_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_lib_path" + fi + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ]])],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + + + + dnl if we found no boost with system layout we search for boost libraries + dnl built and installed without the --layout=system option or for a staged(not installed) version + if test "x$succeeded" != "xyes"; then + _version=0 + if test "$ac_boost_path" != ""; then + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + done + fi + else + for ac_boost_path in /usr /usr/local /opt /opt/local ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + if test "$ac_boost_lib_path" = "" + then + BOOST_LDFLAGS="-L$best_path/lib" + fi + + if test "x$BOOST_ROOT" != "x"; then + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then + AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ]])],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + fi + + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then + AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) + else + AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) + fi + else + AC_SUBST(BOOST_CPPFLAGS) + AC_SUBST(BOOST_LDFLAGS) + AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" +fi + +]) diff --git a/configure.ac b/configure.ac index 847828c3..cbe9a21a 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,11 @@ AC_PROG_CXX AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S +AX_BOOST_BASE([1.34.0]) + +if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" +fi dnl set the $host variable based on local machine/os AC_CANONICAL_HOST @@ -398,6 +403,16 @@ if test "x$ac_cv_header_osg_Version" != "xyes"; then exit fi +AC_CHECK_HEADER(boost/version.hpp) +if test "x$ac_cv_header_boost_version_hpp" != "xyes"; then + echo + echo "You *must* have the Boost library installed on your system" + echo "to build this version of SimGear!" + echo + echo "configure aborted." + exit +fi + AC_LANG_POP dnl Check for system installed zlib diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx index 6b44a055..d20ce3ed 100644 --- a/simgear/scene/model/ModelRegistry.cxx +++ b/simgear/scene/model/ModelRegistry.cxx @@ -473,16 +473,6 @@ ModelRegistry::addNodeCallbackForExtension(const string& extension, nodeCallbackMap.insert(CallbackMap::value_type(extension, callback)); } -ref_ptr ModelRegistry::instance; - -ModelRegistry* ModelRegistry::getInstance() - -{ - if (!instance.valid()) - instance = new ModelRegistry; - return instance.get(); -} - ReaderWriter::ReadResult ModelRegistry::readNode(const string& fileName, const ReaderWriter::Options* opt) @@ -516,7 +506,7 @@ public: registry->setOptions(options); registry->getOrCreateSharedStateManager()-> setShareMode(SharedStateManager::SHARE_STATESETS); - registry->setReadFileCallback(ModelRegistry::getInstance()); + registry->setReadFileCallback(ModelRegistry::instance()); } }; diff --git a/simgear/scene/model/ModelRegistry.hxx b/simgear/scene/model/ModelRegistry.hxx index 229f7557..7b7ffe4e 100644 --- a/simgear/scene/model/ModelRegistry.hxx +++ b/simgear/scene/model/ModelRegistry.hxx @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -200,7 +201,8 @@ typedef ModelRegistryCallback DefaultCallback; // The manager for the callbacks -class ModelRegistry : public osgDB::Registry::ReadFileCallback { +class ModelRegistry : public osgDB::Registry::ReadFileCallback, + public ReferencedSingleton { public: ModelRegistry(); virtual osgDB::ReaderWriter::ReadResult @@ -215,10 +217,8 @@ public: void addNodeCallbackForExtension(const std::string& extension, osgDB::Registry::ReadFileCallback* callback); - static ModelRegistry* getInstance(); virtual ~ModelRegistry() {} protected: - static osg::ref_ptr instance; typedef std::map > CallbackMap; CallbackMap imageCallbackMap; @@ -243,7 +243,7 @@ class ModelRegistryCallbackProxy public: ModelRegistryCallbackProxy(std::string extension) { - ModelRegistry::getInstance() + ModelRegistry::instance() ->addNodeCallbackForExtension(extension, new T(extension)); } }; diff --git a/simgear/scene/sky/newcloud.cxx b/simgear/scene/sky/newcloud.cxx index 62e75501..3624a53c 100644 --- a/simgear/scene/sky/newcloud.cxx +++ b/simgear/scene/sky/newcloud.cxx @@ -48,7 +48,9 @@ #include #include +#include #include +#include #include "cloudfield.hxx" #include "newcloud.hxx" diff --git a/simgear/scene/tgdb/GroundLightManager.cxx b/simgear/scene/tgdb/GroundLightManager.cxx index 09309087..d500103b 100644 --- a/simgear/scene/tgdb/GroundLightManager.cxx +++ b/simgear/scene/tgdb/GroundLightManager.cxx @@ -30,12 +30,6 @@ GroundLightManager::GroundLightManager() groundLightSS = makeLightSS(); } -GroundLightManager* GroundLightManager::instance() -{ - static ref_ptr manager = new GroundLightManager; - return manager.get(); -} - void GroundLightManager::update(const SGUpdateVisitor* updateVisitor) { osg::Fog* fog; diff --git a/simgear/scene/tgdb/GroundLightManager.hxx b/simgear/scene/tgdb/GroundLightManager.hxx index f9bfdf79..92130db0 100644 --- a/simgear/scene/tgdb/GroundLightManager.hxx +++ b/simgear/scene/tgdb/GroundLightManager.hxx @@ -22,11 +22,14 @@ #include #include #include + + +#include #include namespace simgear { -class GroundLightManager : public osg::Referenced { +class GroundLightManager : public ReferencedSingleton { public: GroundLightManager(); osg::StateSet* getRunwayLightStateSet() { return runwayLightSS.get(); } @@ -36,7 +39,6 @@ public: // so use it. void update (const SGUpdateVisitor* updateVisitor); unsigned getLightNodeMask(const SGUpdateVisitor* updateVisitor); - static GroundLightManager* instance(); protected: osg::ref_ptr runwayLightSS; osg::ref_ptr taxiLightSS; diff --git a/simgear/scene/util/StateAttributeFactory.cxx b/simgear/scene/util/StateAttributeFactory.cxx index 90237960..43e09b97 100644 --- a/simgear/scene/util/StateAttributeFactory.cxx +++ b/simgear/scene/util/StateAttributeFactory.cxx @@ -18,11 +18,17 @@ * MA 02110-1301, USA. * */ +#include "StateAttributeFactory.hxx" -#include +#include +#include +#include +#include +#include +#include +#include #include -#include "StateAttributeFactory.hxx" using namespace osg; @@ -66,15 +72,4 @@ StateAttributeFactory::StateAttributeFactory() _cullFaceBack->setDataVariance(Object::STATIC); } -osg::ref_ptr StateAttributeFactory::_theInstance; -OpenThreads::Mutex StateAttributeFactory::_instanceMutex; - -StateAttributeFactory* StateAttributeFactory::instance() -{ - OpenThreads::ScopedLock lock(_instanceMutex); - if (!_theInstance.valid()) { - _theInstance = new StateAttributeFactory; - } - return _theInstance.get(); -} } diff --git a/simgear/scene/util/StateAttributeFactory.hxx b/simgear/scene/util/StateAttributeFactory.hxx index 0a7809dd..9d55ebc0 100644 --- a/simgear/scene/util/StateAttributeFactory.hxx +++ b/simgear/scene/util/StateAttributeFactory.hxx @@ -24,18 +24,25 @@ #include #include -#include #include -#include -#include -#include -#include -#include + +namespace osg +{ +class AlphaFunc; +class BlendFunc; +class CullFace; +class ShadeModel; +class Texture2D; +class TexEnv; +} + +#include // Return read-only instances of common OSG state attributes. namespace simgear { -class StateAttributeFactory : public osg::Referenced { +class StateAttributeFactory : + public ReferencedSingleton { public: // Alpha test > .01 osg::AlphaFunc* getStandardAlphaFunc() { return _standardAlphaFunc.get(); } @@ -52,10 +59,8 @@ public: // cull front and back facing polygons osg::CullFace* getCullFaceFront() { return _cullFaceFront.get(); } osg::CullFace* getCullFaceBack() { return _cullFaceBack.get(); } - - static StateAttributeFactory* instance(); + StateAttributeFactory(); protected: - StateAttributeFactory(); osg::ref_ptr _standardAlphaFunc; osg::ref_ptr _smooth; osg::ref_ptr _flat; @@ -65,8 +70,6 @@ protected: osg::ref_ptr _white; osg::ref_ptr _cullFaceFront; osg::ref_ptr _cullFaceBack; - static osg::ref_ptr _theInstance; - static OpenThreads::Mutex _instanceMutex; }; } #endif diff --git a/simgear/structure/Makefile.am b/simgear/structure/Makefile.am index 17e2ff9b..d0009177 100644 --- a/simgear/structure/Makefile.am +++ b/simgear/structure/Makefile.am @@ -16,7 +16,8 @@ include_HEADERS = \ SGReferenced.hxx \ SGSharedPtr.hxx \ SGSmplhist.hxx \ - SGSmplstat.hxx + SGSmplstat.hxx \ + Singleton.hxx libsgstructure_a_SOURCES = \ commands.cxx \ diff --git a/simgear/structure/Singleton.hxx b/simgear/structure/Singleton.hxx new file mode 100644 index 00000000..0c3a5946 --- /dev/null +++ b/simgear/structure/Singleton.hxx @@ -0,0 +1,58 @@ +#ifndef SIMGEAR_SINGLETON_HXX +#define SIMGEAR_SINGLETON_HXX 1 + +#include + +#include +#include + +namespace simgear +{ +/** + * Class that supplies the address of a singleton instance. This class + * can be inherited by its Class argument in order to support the + * instance() method in that class. + */ +template +class Singleton +{ +protected: + Singleton() {} +public: + static Class* instance() + { + Class& singleton + = boost::details::pool::singleton_default::instance(); + return &singleton; + } +}; + +template +class SingletonRefPtr +{ +public: + SingletonRefPtr() + { + ptr = new RefClass; + } + static RefClass* instance() + { + SingletonRefPtr& singleton + = boost::details::pool::singleton_default::instance(); + return singleton.ptr.get(); + } +private: + osg::ref_ptr ptr; +}; + +template +class ReferencedSingleton : public virtual osg::Referenced +{ +public: + static RefClass* instance() + { + return SingletonRefPtr::instance(); + } +}; +} +#endif -- 2.39.5