|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r52452 - in sandbox/task/boost/task: . detail
From: oliver.kowalke_at_[hidden]
Date: 2009-04-17 14:28:18
Author: olli
Date: 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
New Revision: 52452
URL: http://svn.boost.org/trac/boost/changeset/52452
Log:
* include headers for ABI fixing
* intrduction of BOOST_HAS_PROCESSOR_BINDINGS
Text files modified:
sandbox/task/boost/task/default_pool.hpp | 4 ++++
sandbox/task/boost/task/detail/bind_processor.hpp | 18 +++++++-----------
sandbox/task/boost/task/detail/callable.hpp | 4 ++++
sandbox/task/boost/task/detail/config.hpp | 7 +++++++
sandbox/task/boost/task/detail/guard.hpp | 4 ++++
sandbox/task/boost/task/detail/interrupter.hpp | 4 ++++
sandbox/task/boost/task/detail/semaphore_posix.hpp | 4 ++++
sandbox/task/boost/task/detail/semaphore_windows.hpp | 4 ++++
sandbox/task/boost/task/detail/worker.hpp | 5 ++++-
sandbox/task/boost/task/detail/worker_group.hpp | 4 ++++
sandbox/task/boost/task/detail/wsq.hpp | 6 +++++-
sandbox/task/boost/task/pool.hpp | 8 +++-----
sandbox/task/boost/task/poolsize.hpp | 4 ++++
sandbox/task/boost/task/scanns.hpp | 4 ++++
sandbox/task/boost/task/watermark.hpp | 6 +++++-
15 files changed, 67 insertions(+), 19 deletions(-)
Modified: sandbox/task/boost/task/default_pool.hpp
==============================================================================
--- sandbox/task/boost/task/default_pool.hpp (original)
+++ sandbox/task/boost/task/default_pool.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -11,6 +11,8 @@
#include <boost/task/pool.hpp>
#include <boost/task/unbounded_channel.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
typedef pool< unbounded_channel< fifo > > default_pool;
@@ -26,4 +28,6 @@
{ return detail::static_pool::instance; }
} }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DEFAULT_POOL_H
Modified: sandbox/task/boost/task/detail/bind_processor.hpp
==============================================================================
--- sandbox/task/boost/task/detail/bind_processor.hpp (original)
+++ sandbox/task/boost/task/detail/bind_processor.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -7,24 +7,20 @@
#ifndef BOOST_TASK_DETAIL_BIND_PROCESSOR_H
#define BOOST_TASK_DETAIL_BIND_PROCESSOR_H
-#include <boost/tp/detail/config.hpp>
-
-#define BOOST_THREAD_BIND_PROCESSOR_AFFINITY 1
+#include <boost/task/detail/config.hpp>
# if defined(BOOST_WINDOWS_OS)
-# include <boost/tp/detail/bind_processor_windows.hpp>
+# include <boost/task/detail/bind_processor_windows.hpp>
# elif defined(BOOST_LINUX_OS)
-# include <boost/tp/detail/bind_processor_linux.hpp>
+# include <boost/task/detail/bind_processor_linux.hpp>
//# elif defined(BOOST_xBSD_OS)
-//# include <boost/tp/detail/bind_processor_bsd.hpp>
+//# include <boost/task/detail/bind_processor_bsd.hpp>
# elif defined(BOOST_AIX_OS)
-# include <boost/tp/detail/bind_processor_aix.hpp>
+# include <boost/task/detail/bind_processor_aix.hpp>
# elif defined(BOOST_HPUX_OS)
-# include <boost/tp/detail/bind_processor_hpux.hpp>
+# include <boost/task/detail/bind_processor_hpux.hpp>
# elif defined(BOOST_SOLARIS_OS)
-# include <boost/tp/detail/bind_processor_solaris.hpp>
-# else
-# undef BOOST_THREAD_BIND_PROCESSOR_AFFINITY
+# include <boost/task/detail/bind_processor_solaris.hpp>
# endif
#endif // BOOST_TASK_DETAIL_BIND_PROCESSOR_H
Modified: sandbox/task/boost/task/detail/callable.hpp
==============================================================================
--- sandbox/task/boost/task/detail/callable.hpp (original)
+++ sandbox/task/boost/task/detail/callable.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -13,6 +13,8 @@
#include <boost/task/task.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -78,5 +80,7 @@
};
} } }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_CALLABLE_H
Modified: sandbox/task/boost/task/detail/config.hpp
==============================================================================
--- sandbox/task/boost/task/detail/config.hpp (original)
+++ sandbox/task/boost/task/detail/config.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -19,18 +19,25 @@
# endif
# endif
+#define BOOST_HAS_PROCESSOR_BINDINGS 0
+
# if defined(BOOST_WINDOWS_API)
# define BOOST_WINDOWS_OS
+# define BOOST_HAS_PROCESSOR_BINDINGS 1
# elif defined(linux) || defined(__linux) || defined(__linux__)
# define BOOST_LINUX_OS
+# define BOOST_HAS_PROCESSOR_BINDINGS 1
# elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
# define BOOST_xBSD_OS
# elif defined(__IBMCPP__) || defined(_AIX)
# define BOOST_AIX_OS
+# define BOOST_HAS_PROCESSOR_BINDINGS 1
# elif defined(__hpux)
# define BOOST_HPUX_OS
+# define BOOST_HAS_PROCESSOR_BINDINGS 1
# elif defined(sun) || defined(__sun)
# define BOOST_SOLARIS_OS
+# define BOOST_HAS_PROCESSOR_BINDINGS 1
# endif
#endif // BOOST_TASK_DETAIL_CONFIG_H
Modified: sandbox/task/boost/task/detail/guard.hpp
==============================================================================
--- sandbox/task/boost/task/detail/guard.hpp (original)
+++ sandbox/task/boost/task/detail/guard.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -9,6 +9,8 @@
#include <boost/utility.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -25,5 +27,7 @@
};
} } }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_GUARD_H
Modified: sandbox/task/boost/task/detail/interrupter.hpp
==============================================================================
--- sandbox/task/boost/task/detail/interrupter.hpp (original)
+++ sandbox/task/boost/task/detail/interrupter.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -15,6 +15,8 @@
#include <boost/thread/thread_time.hpp>
#include <boost/utility.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -82,4 +84,6 @@
};
}}}
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_INTERRUPTER_H
Modified: sandbox/task/boost/task/detail/semaphore_posix.hpp
==============================================================================
--- sandbox/task/boost/task/detail/semaphore_posix.hpp (original)
+++ sandbox/task/boost/task/detail/semaphore_posix.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -14,6 +14,8 @@
#include <boost/utility.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -37,4 +39,6 @@
};
}}}
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_SEMAPHORE_POSIX_H
Modified: sandbox/task/boost/task/detail/semaphore_windows.hpp
==============================================================================
--- sandbox/task/boost/task/detail/semaphore_windows.hpp (original)
+++ sandbox/task/boost/task/detail/semaphore_windows.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -14,6 +14,8 @@
#include <boost/utility.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -37,4 +39,6 @@
};
}}}
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_SEMAPHORE_WINDOWS_H
Modified: sandbox/task/boost/task/detail/worker.hpp
==============================================================================
--- sandbox/task/boost/task/detail/worker.hpp (original)
+++ sandbox/task/boost/task/detail/worker.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -25,6 +25,8 @@
#include <boost/task/poolsize.hpp>
#include <boost/task/scanns.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -291,8 +293,9 @@
static worker * tss_get();
};
+}}}
-} } }
+#include <boost/config/abi_suffix.hpp>
#endif // BOOST_TASK_DETAIL_WORKER_H
Modified: sandbox/task/boost/task/detail/worker_group.hpp
==============================================================================
--- sandbox/task/boost/task/detail/worker_group.hpp (original)
+++ sandbox/task/boost/task/detail/worker_group.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -17,6 +17,8 @@
#include <boost/task/detail/worker.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -81,5 +83,7 @@
};
} } }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_DETAIL_WORKER_GROUP_H
Modified: sandbox/task/boost/task/detail/wsq.hpp
==============================================================================
--- sandbox/task/boost/task/detail/wsq.hpp (original)
+++ sandbox/task/boost/task/detail/wsq.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -13,6 +13,8 @@
#include <boost/task/detail/callable.hpp>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
namespace detail
@@ -41,7 +43,9 @@
bool try_steal( callable &);
};
-} } }
+}}}
+
+#include <boost/config/abi_suffix.hpp>
#endif // BOOST_TASK_DETAIL_WSQ_H
Modified: sandbox/task/boost/task/pool.hpp
==============================================================================
--- sandbox/task/boost/task/pool.hpp (original)
+++ sandbox/task/boost/task/pool.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -19,10 +19,8 @@
#include <boost/utility.hpp>
#include <boost/task/detail/atomic.hpp>
-#include <boost/task/detail/callable.hpp>
-#ifdef BOOST_TASK_BIND_WORKER_TO_PROCESSOR
#include <boost/task/detail/bind_processor.hpp>
-#endif
+#include <boost/task/detail/callable.hpp>
#include <boost/task/detail/worker.hpp>
#include <boost/task/detail/worker_group.hpp>
#include <boost/task/exceptions.hpp>
@@ -79,7 +77,7 @@
this) ) );
}
-#ifdef BOOST_TASK_BIND_WORKER_TO_PROCESSOR
+#ifdef BOOST_HAS_PROCESSOR_BINDINGS
void worker_entry_( std::size_t n)
{
this_thread::bind_to_processor( n);
@@ -167,7 +165,7 @@
lk.unlock();
}
-#ifdef BOOST_TASK_BIND_WORKER_TO_PROCESSOR
+#ifdef BOOST_HAS_PROCESSOR_BINDINGS
explicit pool(
posix_time::time_duration const& asleep = posix_time::microseconds( 10),
scanns const& max_scns = scanns( 20) )
Modified: sandbox/task/boost/task/poolsize.hpp
==============================================================================
--- sandbox/task/boost/task/poolsize.hpp (original)
+++ sandbox/task/boost/task/poolsize.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -9,6 +9,8 @@
#include <cstddef>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
class poolsize
@@ -23,4 +25,6 @@
};
} }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_POOLSIZE_H
Modified: sandbox/task/boost/task/scanns.hpp
==============================================================================
--- sandbox/task/boost/task/scanns.hpp (original)
+++ sandbox/task/boost/task/scanns.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -9,6 +9,8 @@
#include <cstddef>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
class scanns
@@ -23,4 +25,6 @@
};
} }
+#include <boost/config/abi_suffix.hpp>
+
#endif // BOOST_TASK_SCANNS_H
Modified: sandbox/task/boost/task/watermark.hpp
==============================================================================
--- sandbox/task/boost/task/watermark.hpp (original)
+++ sandbox/task/boost/task/watermark.hpp 2009-04-17 14:28:16 EDT (Fri, 17 Apr 2009)
@@ -9,6 +9,8 @@
#include <cstddef>
+#include <boost/config/abi_prefix.hpp>
+
namespace boost { namespace task
{
class high_watermark
@@ -32,6 +34,8 @@
operator std::size_t () const;
};
-} }
+}}
+
+#include <boost/config/abi_suffix.hpp>
#endif // BOOST_TASK_WATER_MARK_H
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk