songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF

This commit is contained in:
Andreas Fabri 2015-11-09 14:26:42 +01:00
parent 9ec1f4653d ca54af03c2
commit 6b2c4dd7c6
18 changed files with 168 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AABB_tree/include/CGAL/AABB_tree.h
View File

@ -31,7 +31,7 @@
#include <boost/optional.hpp>
#ifdef CGAL_HAS_THREADS
#include <boost/thread/mutex.hpp>
#include <CGAL/mutex.h>
#endif
/// \file AABB_tree.h
@ -500,7 +500,7 @@ public:
{
#ifdef CGAL_HAS_THREADS
//this ensures that this is done once at a time
boost::mutex::scoped_lock scoped_lock(kd_tree_mutex);
CGAL_SCOPED_LOCK(kd_tree_mutex);
#endif
clear_search_tree();
return accelerate_distance_queries_impl(first,beyond);
@ -599,8 +599,8 @@ public:
// single root node
Node* m_p_root_node;
#ifdef CGAL_HAS_THREADS
mutable boost::mutex internal_tree_mutex;//mutex used to protect const calls inducing build()
mutable boost::mutex kd_tree_mutex;//mutex used to protect calls to accelerate_distance_queries
mutable CGAL_MUTEX internal_tree_mutex;//mutex used to protect const calls inducing build()
mutable CGAL_MUTEX kd_tree_mutex;//mutex used to protect calls to accelerate_distance_queries
#endif
const Node* root_node() const {
@ -608,7 +608,7 @@ public:
if(m_need_build){
#ifdef CGAL_HAS_THREADS
//this ensures that build() will be called once
boost::mutex::scoped_lock scoped_lock(internal_tree_mutex);
CGAL_SCOPED_LOCK(internal_tree_mutex);
if(m_need_build)
#endif
const_cast< AABB_tree<AABBTraits>* >(this)->build();
@ -1046,7 +1046,7 @@ public:
if(m_primitives.empty()) return true;
#ifdef CGAL_HAS_THREADS
//this ensures that this function will be done once
boost::mutex::scoped_lock scoped_lock(kd_tree_mutex);
CGAL_SCOPED_LOCK(kd_tree_mutex);
#endif
//we only redo computation only if needed

11
Documentation/doc/Documentation/Installation.txt
View File

@ -293,7 +293,7 @@ We next list the libraries and essential 3rd party software
| Library | CMake Variable | Functionality | Dependencies |
| :-------- | :------------- | :------------ | :----------- |
| `%CGAL` | none | Main library | \sc{Gmp}, \sc{Mpfr}, \sc{Boost} (headers), Boost.Thread and Boost.System (library) |
| `%CGAL` | none | Main library | \sc{Gmp}, \sc{Mpfr}, \sc{Boost} (headers), Boost.Thread and Boost.System (library) for compilers not supporting the keyword `threadlocal` |
| `CGAL_Core` | `WITH_CGAL_Core` | The CORE library for algebraic numbers.\cgalFootnote{CGAL_Core is not part of \cgal, but a custom version of the \sc{Core} library distributed by \cgal for the user convenience and it has it's own license.} | \sc{Gmp} and \sc{Mpfr} |
| `CGAL_ImageIO` | `WITH_CGAL_ImageIO` | Utilities to read and write image files | \sc{OpenGL}, \sc{zlib}, \sc{Vtk}(optional) |
| `CGAL_Qt5` | `WITH_CGAL_Qt5` | `QGraphicsView` support for \sc{Qt}5-based demos | \sc{Qt}5 and \sc{OpenGL} |
@ -350,7 +350,8 @@ installed as binaries.
\cgal requires the \sc{Boost} libraries. In particular the header files
and the threading library (`Boost.Thread` and
`Boost.System` binaries). Version 1.48 (or higher) are needed.
`Boost.System` binaries). Version 1.48 (or higher) are needed
for compilers not supporting the keyword `threadlocal` (This is supported for g++ when using the option `-std=c++11`, and for Visual C++ starting with 2015, that is VC14).
On Windows, as auto-linking is used, you also need the binaries of
`Boost.Serialization` and `Boost.DateTime`, but the
@ -360,9 +361,9 @@ not depend on the DLL's of those two libraries.
In \cgal some demos and examples depend on `Boost.Program_options`.
In case the \sc{Boost} libraries are not installed on your system already, you
can obtain them from <A HREF="http://www.boost.org/">`http://www.boost.org/`</A>. For Windows you can download precompiled libraries
from <A HREF="http://boost.teeks99.com/">`http://boost.teeks99.com/`</A>.
Since `Boost.Thread` is required, make sure to either install the precompiled
can obtain them from <A HREF="http://www.boost.org/">`http://www.boost.org/`</A>. For Visual C++ you can download precompiled libraries
from <A HREF="http://sourceforge.net/projects/boost/files/boost-binaries/">`http://sourceforge.net/projects/boost/files/boost-binaries/`</A>.
For Visual C++ versions prior to 2015 `Boost.Thread` is required, so make sure to either install the precompiled
libraries for your compiler or build `libboost-thread` and `libboost-system`.
As on Windows there is no canonical directory for where to find

16
Filtered_kernel/include/CGAL/Lazy.h
View File

@ -33,10 +33,7 @@
#include <CGAL/Bbox_3.h>
#include <vector>
#include <CGAL/Default.h>
#ifdef CGAL_HAS_THREADS
# include <boost/thread/tss.hpp>
#endif
#include<CGAL/tss.h>
#include <boost/optional.hpp>
#include <boost/variant.hpp>
@ -787,16 +784,9 @@ private:
// which is in particular heavily used for pruning DAGs.
static const Self & zero()
{
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr<Self> z;
if (z.get() == NULL) {
z.reset(new Self(new Lazy_rep_0<AT, ET, E2A>()));
}
return * z.get();
#else
static const Self z = new Lazy_rep_0<AT, ET, E2A>();
Lazy_rep_0<AT, ET, E2A>* ptr = new Lazy_rep_0<AT, ET, E2A>();
static CGAL_THREAD_LOCAL_VARIABLE(Self,z,ptr);
return z;
#endif
}
Self_rep * ptr() const { return (Self_rep*) PTR; }

8
Installation/changes.html
View File

@ -127,6 +127,14 @@ and <code>src/</code> directories).
</li>
</ul>
<h3>Installation</h3>
<ul>
<li>Starting with Visual C++ 2015 we no longer require <code>Boost.Thread</code>
as we use the keyword <code>threadlocal</code> and the class <code>mutex</code>
from the header file <code><thread></code>.
<li>The same holds for g++ when compiling with the option <code>-std=c++11</code>.
</ul>
<!-- New packages -->
<!-- Major and breaking changes -->
<!-- Arithmetic and Algebra -->

7
Installation/cmake/modules/CGAL_SetupBoost.cmake
View File

@ -3,7 +3,12 @@ if ( NOT CGAL_Boost_Setup )
include(CGAL_TweakFindBoost)
# In the documentation, we say we require Boost-1.48, but technically we
# require 1.39. Some packages may require more recent versions, though.
find_package( Boost 1.39 REQUIRED thread system )
if ( DEFINED MSVC_VERSION AND ( "${MSVC_VERSION}" GREATER 1800) )
find_package( Boost 1.39 REQUIRED )
else()
find_package( Boost 1.39 REQUIRED thread system )
endif()
if(Boost_FOUND)
if(DEFINED Boost_DIR AND NOT Boost_DIR)

12
Installation/include/CGAL/config.h
View File

@ -427,6 +427,18 @@ using std::max;
# endif
#endif
#if ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
&& (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 \
&& __cplusplus >= 201103L ) || ( _MSC_VER >= 1900 )
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL
#endif
#if ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
&& (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 \
&& __cplusplus >= 201103L ) || ( _MSC_VER >= 1700 )
#define CGAL_CAN_USE_CXX11_MUTEX
#endif
// Support for LEDA with threads
// Not that, if CGAL_HAS_THREADS is defined, and you want to use LEDA,
// you must link with a version of LEDA libraries that support threads.

17
Installation/include/CGAL/mutex.h Normal file
View File

@ -0,0 +1,17 @@
#ifndef CGAL_MUTEX_H
#define CGAL_MUTEX_H
#include <CGAL/config.h>
#ifdef CGAL_HAS_THREADS
#ifdef CGAL_CAN_USE_CXX11_MUTEX
#include <mutex>
#define CGAL_MUTEX std::mutex
#define CGAL_SCOPED_LOCK(M) std::unique_lock<std::mutex> scoped_lock(M)
#else
#include <boost/thread/mutex.hpp>
#define CGAL_MUTEX boost::mutex
#define CGAL_SCOPED_LOCK(M) boost::mutex::scoped_lock scoped_lock(M)
#endif
#endif
#endif // CGAL_MUTEX_H

36
Installation/include/CGAL/tss.h Normal file
View File

@ -0,0 +1,36 @@
#ifndef CGAL_TSS_H
#define CGAL_TSS_H
#include <CGAL/config.h>
#if defined( CGAL_HAS_THREADS )
# ifdef CGAL_CAN_USE_CXX11_THREAD_LOCAL
//# pragma message ( "Use keyword thread_local" )
# else
//# pragma message ("Use thread_local from boost")
# define CGAL_USE_BOOST_THREAD
# include <boost/thread/tss.hpp>
# endif
# ifdef CGAL_USE_BOOST_THREAD
# define CGAL_THREAD_LOCAL_VARIABLE(TYPE, VAR,VAL) \
boost::thread_specific_ptr<TYPE> VAR##_ptr; \
if(VAR##_ptr.get() == NULL) {VAR##_ptr.reset(new TYPE(VAL));} \
TYPE& VAR = * VAR##_ptr.get()
# else
# define CGAL_THREAD_LOCAL_VARIABLE(TYPE, VAR,VAL) \
thread_local TYPE VAR = VAL
# endif
#else
# define CGAL_THREAD_LOCAL_VARIABLE(TYPE, VAR,VAL) TYPE VAR = VAL
#endif
#endif // CGAL_TSS_H

12
Minkowski_sum_2/include/CGAL/Minkowski_sum_2/AABB_tree_with_join.h
View File

@ -31,7 +31,7 @@
#include <boost/optional.hpp>
#ifdef CGAL_HAS_THREADS
#include <boost/thread/mutex.hpp>
#include <CGAL/mutex.h>
#endif
/// \file AABB_tree.h
@ -506,7 +506,7 @@ public:
{
#ifdef CGAL_HAS_THREADS
//this ensures that this is done once at a time
boost::mutex::scoped_lock scoped_lock(kd_tree_mutex);
CGAL_SCOPED_LOCK(kd_tree_mutex);
#endif
clear_search_tree();
return accelerate_distance_queries_impl(first,beyond);
@ -623,8 +623,8 @@ public:
// single root node
Node* m_p_root_node;
#ifdef CGAL_HAS_THREADS
mutable boost::mutex internal_tree_mutex;//mutex used to protect const calls inducing build()
mutable boost::mutex kd_tree_mutex;//mutex used to protect calls to accelerate_distance_queries
mutable CGAL_MUTEX internal_tree_mutex;//mutex used to protect const calls inducing build()
mutable CGAL_MUTEX kd_tree_mutex;//mutex used to protect calls to accelerate_distance_queries
#endif
const Node* root_node() const {
@ -632,7 +632,7 @@ public:
if(m_need_build){
#ifdef CGAL_HAS_THREADS
//this ensures that build() will be called once
boost::mutex::scoped_lock scoped_lock(internal_tree_mutex);
CGAL_SCOPED_LOCK(internal_tree_mutex);
if(m_need_build)
#endif
const_cast< AABB_tree_with_join<AABBTraits>* >(this)->build();
@ -1070,7 +1070,7 @@ public:
if(m_primitives.empty()) return true;
#ifdef CGAL_HAS_THREADS
//this ensures that this function will be done once
boost::mutex::scoped_lock scoped_lock(kd_tree_mutex);
CGAL_SCOPED_LOCK(kd_tree_mutex);
#endif
//we only redo computation only if needed

119
Modular_arithmetic/include/CGAL/Modular_arithmetic/Residue_type.h
View File

@ -22,13 +22,12 @@
#define CGAL_RESIDUE_TYPE_H
#include <CGAL/basic.h>
#include <CGAL/tss.h>
#include <cfloat>
#include <boost/operators.hpp>
#ifdef CGAL_HAS_THREADS
# include <boost/thread/tss.hpp>
#endif
namespace CGAL {
@ -71,96 +70,40 @@ private:
static const double& get_static_CST_CUT()
{ return Residue::CST_CUT; }
#endif // CGAL_HEADER_ONLY
#ifdef CGAL_HAS_THREADS
#ifdef CGAL_HEADER_ONLY
static boost::thread_specific_ptr<int>& get_static_prime_int_()
static int& prime_int_internal()
{
static boost::thread_specific_ptr<int> prime_int_;
return prime_int_;
}
static boost::thread_specific_ptr<double>& get_static_prime_()
{
static boost::thread_specific_ptr<double> prime_;
return prime_;
}
static boost::thread_specific_ptr<double>& get_static_prime_inv_()
{
static boost::thread_specific_ptr<double> prime_inv_;
return prime_inv_;
}
#else // CGAL_HEADER_ONLY
CGAL_EXPORT static boost::thread_specific_ptr<int> prime_int_;
CGAL_EXPORT static boost::thread_specific_ptr<double> prime_;
CGAL_EXPORT static boost::thread_specific_ptr<double> prime_inv_;
static boost::thread_specific_ptr<int>& get_static_prime_int_()
{ return Residue::prime_int_; }
static boost::thread_specific_ptr<double>& get_static_prime_()
{ return Residue::prime_; }
static boost::thread_specific_ptr<double>& get_static_prime_inv_()
{ return Residue::prime_inv_; }
#endif // CGAL_HEADER_ONLY
static void init_class_for_thread(){
CGAL_precondition(get_static_prime_int_().get() == NULL);
CGAL_precondition(get_static_prime_().get() == NULL);
CGAL_precondition(get_static_prime_inv_().get() == NULL);
get_static_prime_int_().reset(new int(67111067));
get_static_prime_().reset(new double(67111067.0));
get_static_prime_inv_().reset(new double(1.0/67111067.0));
static CGAL_THREAD_LOCAL_VARIABLE(int, prime_int, 67111067);
return prime_int;
}
static inline int get_prime_int(){
if (get_static_prime_int_().get() == NULL)
init_class_for_thread();
return *get_static_prime_int_().get();
return prime_int_internal();
}
static inline double get_prime(){
if (get_static_prime_().get() == NULL)
init_class_for_thread();
return *get_static_prime_().get();
}
static inline double get_prime_inv(){
if (get_static_prime_inv_().get() == NULL)
init_class_for_thread();
return *get_static_prime_inv_().get();
}
#else // CGAL_HAS_THREADS
#ifdef CGAL_HEADER_ONLY
static int& get_static_prime_int()
static double& prime_internal()
{
static int prime_int = 67111067;
return prime_int;
}
static double& get_static_prime()
{
static double prime = 67111067.0;
static CGAL_THREAD_LOCAL_VARIABLE(double, prime, 67111067.0);
return prime;
}
static double& get_static_prime_inv()
static inline double get_prime(){
return prime_internal();
}
static double& prime_inv_internal()
{
static double prime_inv = 1/67111067.0;
static CGAL_THREAD_LOCAL_VARIABLE(double, prime_inv, 1490067204.5640400859667452463541);
return prime_inv;
}
#else //
CGAL_EXPORT static int prime_int;
CGAL_EXPORT static double prime;
CGAL_EXPORT static double prime_inv;
static int& get_static_prime_int()
{ return Residue::prime_int; }
static double& get_static_prime()
{ return Residue::prime; }
static double& get_static_prime_inv()
{ return Residue::prime_inv; }
#endif // CGAL_HEADER_ONLY
static int get_prime_int(){ return get_static_prime_int();}
static double get_prime() { return get_static_prime();}
static double get_prime_inv(){ return get_static_prime_inv();}
#endif
static inline double get_prime_inv(){
return prime_inv_internal();
}
/* Quick integer rounding, valid if a<2^51. for double */
static inline
@ -255,15 +198,10 @@ public:
static int
set_current_prime(int p){
int old_prime = get_prime_int();
#ifdef CGAL_HAS_THREADS
*get_static_prime_int_().get() = p;
*get_static_prime_().get() = double(p);
*get_static_prime_inv_().get() = 1.0/double(p);
#else
get_static_prime_int() = p;
get_static_prime() = double(p);
get_static_prime_inv() = 1.0 / prime;
#endif
prime_int_internal() = p;
prime_internal() = double(p);
prime_inv_internal() = 1.0 / double(p);
return old_prime;
}
@ -289,10 +227,11 @@ public:
}
//! constructor of Residue, from long
Residue(long n){
Residue (long n) {
x_= RES_soft_reduce (static_cast< double > (n % get_prime_int()));
}
//! constructor of Residue, from long long
Residue (long long n) {
x_= RES_soft_reduce (static_cast< double > (n % get_prime_int()));

9
Modular_arithmetic/src/CGAL/Residue_type.cpp
View File

@ -23,16 +23,7 @@
#include <CGAL/Modular_arithmetic/Residue_type.h>
namespace CGAL{
#ifdef CGAL_HAS_THREADS
boost::thread_specific_ptr<int> Residue::prime_int_;
boost::thread_specific_ptr<double> Residue::prime_;
boost::thread_specific_ptr<double> Residue::prime_inv_;
#else
int Residue::prime_int = 67111067;
double Residue::prime = 67111067.0;
double Residue::prime_inv =1/67111067.0;
#endif
const double Residue::CST_CUT = std::ldexp( 3., 51 );

49
Number_types/include/CGAL/GMP/Gmpfi_type.h
View File

@ -26,9 +26,8 @@
#include <mpfi.h>
#include <boost/operators.hpp>
#include <CGAL/Uncertain.h>
#ifdef CGAL_HAS_THREADS
# include <boost/thread/tss.hpp>
#endif
#include <CGAL/tss.h>
#include <limits>
#include <algorithm>
@ -80,11 +79,8 @@ Uncertain<bool> operator==(const Gmpfi&,const Gmpq&);
// the default precision is a variable local to each thread in multithreaded
// environments, or a global variable otherwise
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr<mp_prec_t> Gmpfi_default_precision_;
#else
static mp_prec_t Gmpfi_default_precision=CGAL_GMPFI_DEFAULT_PRECISION;
#endif
class Gmpfi:
boost::ordered_euclidian_ring_operators1<Gmpfi,
@ -109,6 +105,12 @@ class Gmpfi:
Gmpfr _left,_right;
mutable __mpfi_struct _interval;
static mp_prec_t& default_precision()
{
static CGAL_THREAD_LOCAL_VARIABLE(mp_prec_t, Gmpfi_default_precision, CGAL_GMPFI_DEFAULT_PRECISION);
}
bool is_unique(){
#ifdef CGAL_GMPFR_NO_REFCOUNT
return true;
@ -296,9 +298,7 @@ CGAL_GMPFI_CONSTRUCTOR_FROM_SCALAR(Gmpz);
// default precision
#ifdef CGAL_HAS_THREADS
static void init_precision_for_thread();
#endif
static Gmpfi::Precision_type get_default_precision();
static Gmpfi::Precision_type set_default_precision(
Gmpfi::Precision_type prec);
@ -400,35 +400,20 @@ CGAL_GMPFI_CONSTRUCTOR_FROM_SCALAR(Gmpz);
// --------------
// default precision
#ifdef CGAL_HAS_THREADS
inline
void Gmpfi::init_precision_for_thread(){
CGAL_precondition(Gmpfi_default_precision_.get()==NULL);
Gmpfi_default_precision_.reset(
new mp_prec_t(CGAL_GMPFI_DEFAULT_PRECISION));
}
#endif
inline
Gmpfi::Precision_type Gmpfi::get_default_precision(){
#ifdef CGAL_HAS_THREADS
if(Gmpfi_default_precision_.get()==NULL)
Gmpfi::init_precision_for_thread();
return *Gmpfi_default_precision_.get();
#else
return Gmpfi_default_precision;
#endif
return default_precision();
}
inline
Gmpfi::Precision_type Gmpfi::set_default_precision(Gmpfi::Precision_type prec){
Gmpfi::Precision_type old_prec=Gmpfi::get_default_precision();
Gmpfi::Precision_type old_prec= default_precision();
CGAL_assertion(prec>=MPFR_PREC_MIN&&prec<=MPFR_PREC_MAX);
#ifdef CGAL_HAS_THREADS
*Gmpfi_default_precision_.get()=prec;
#else
Gmpfi_default_precision=prec;
#endif
default_precision() = prec;
return old_prec;
}

5
Number_types/include/CGAL/Mpzf.h
View File

@ -108,11 +108,6 @@ CGAL_CLANG_PUSH_AND_IGNORE_UNUSED_LOCAL_TYPEDEF
// int to bool performance
#endif
#if defined(__GNUC__) && defined(__GNUC_MINOR__) \
&& (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 \
&& __cplusplus >= 201103L
#define CGAL_CAN_USE_CXX11_THREAD_LOCAL
#endif
/*
#ifdef CGAL_MPZF_NO_USE_CACHE

16
Polynomial/include/CGAL/Polynomial/Polynomial_type.h
View File

@ -46,10 +46,7 @@ typename CGAL::internal::Innermost_coefficient_type<T>::Type , 2>::Type
#include <CGAL/Polynomial/misc.h>
#include <CGAL/use.h>
#ifdef CGAL_HAS_THREADS
# include <boost/thread/tss.hpp>
#endif
#include <CGAL/tss.h>
namespace CGAL {
@ -268,15 +265,8 @@ protected:
//
private:
static Self& get_default_instance(){
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr< Self > safe_x_ptr;
if (safe_x_ptr.get() == NULL)
safe_x_ptr.reset(new Self(0));
return *safe_x_ptr.get();
#else
static Self x = Self(0);
return x;
#endif
CGAL_THREAD_LOCAL_VARIABLE(Self, x, Self(0));
return x;
}
public:

6
Spatial_searching/include/CGAL/Kd_tree.h
View File

@ -35,7 +35,7 @@
#include <boost/optional.hpp>
#ifdef CGAL_HAS_THREADS
#include <boost/thread/mutex.hpp>
#include <CGAL/mutex.h>
#endif
namespace CGAL {
@ -100,7 +100,7 @@ private:
#ifdef CGAL_HAS_THREADS
mutable boost::mutex building_mutex;//mutex used to protect const calls inducing build()
mutable CGAL_MUTEX building_mutex;//mutex used to protect const calls inducing build()
#endif
bool built_;
@ -284,7 +284,7 @@ private:
void const_build() const {
#ifdef CGAL_HAS_THREADS
//this ensure that build() will be called once
boost::mutex::scoped_lock scoped_lock(building_mutex);
CGAL_SCOPED_LOCK(building_mutex);
if(!is_built())
#endif
const_cast<Self*>(this)->build(); //THIS IS NOT THREADSAFE

8
TDS_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -51,14 +51,6 @@
#include <CGAL/internal/Triangulation_ds_iterators_3.h>
#include <CGAL/internal/Triangulation_ds_circulators_3.h>
#ifdef CGAL_HAS_THREADS
# ifdef CGAL_LINKED_WITH_TBB
# include <tbb/enumerable_thread_specific.h>
# else
# include <boost/thread/tss.hpp>
# endif
#endif
#ifdef CGAL_LINKED_WITH_TBB
# include <tbb/scalable_allocator.h>
#endif

94
Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
View File

@ -31,7 +31,7 @@
#ifndef CGAL_TRIANGULATION_2_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
#include <CGAL/Spatial_sort_traits_adapter_2.h>
#include <CGAL/internal/info_check.h>
#include <CGAL/tss.h>
#include <boost/iterator/zip_iterator.hpp>
#include <boost/mpl/and.hpp>
@ -1053,27 +1053,9 @@ remove_and_give_new_faces(Vertex_handle v, OutputItFaces fit)
afi++) *fit++ = afi;
}
else {
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr< int > maxd_ptr;
static boost::thread_specific_ptr< std::vector<Face_handle> > f_ptr;
static boost::thread_specific_ptr< std::vector<int> > i_ptr;
static boost::thread_specific_ptr< std::vector<Vertex_handle> > w_ptr;
if (maxd_ptr.get() == NULL) {
maxd_ptr.reset(new int(30));
f_ptr.reset(new std::vector<Face_handle>(*maxd_ptr));
i_ptr.reset(new std::vector<int>(*maxd_ptr));
w_ptr.reset(new std::vector<Vertex_handle>(*maxd_ptr));
}
int& maxd=*maxd_ptr;
std::vector<Face_handle>& f=*f_ptr;
std::vector<int>& i=*i_ptr;
std::vector<Vertex_handle>& w=*w_ptr;
#else
static int maxd=30;
static std::vector<Face_handle> f(maxd);
static std::vector<int> i(maxd);
static std::vector<Vertex_handle> w(maxd);
#endif
#include "Delaunay_triangulation_2_tls.h"
int d;
remove_degree_init(v,f,w,i,d,maxd);
remove_degree_triangulate(v,f,w,i,d);
@ -1097,27 +1079,8 @@ remove(Vertex_handle v)
if ( this->dimension() <= 1) { Triangulation::remove(v); return; }
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr< int > maxd_ptr;
static boost::thread_specific_ptr< std::vector<Face_handle> > f_ptr;
static boost::thread_specific_ptr< std::vector<int> > i_ptr;
static boost::thread_specific_ptr< std::vector<Vertex_handle> > w_ptr;
if (maxd_ptr.get() == NULL) {
maxd_ptr.reset(new int(30));
f_ptr.reset(new std::vector<Face_handle>(*maxd_ptr));
i_ptr.reset(new std::vector<int>(*maxd_ptr));
w_ptr.reset(new std::vector<Vertex_handle>(*maxd_ptr));
}
int& maxd=*maxd_ptr;
std::vector<Face_handle>& f=*f_ptr;
std::vector<int>& i=*i_ptr;
std::vector<Vertex_handle>& w=*w_ptr;
#else
static int maxd=30;
static std::vector<Face_handle> f(maxd);
static std::vector<int> i(maxd);
static std::vector<Vertex_handle> w(maxd);
#endif
#include "Delaunay_triangulation_2_tls.h"
remove_degree_init(v,f,w,i,d,maxd);
if (d == 0) return; // dim is going down
remove_degree_triangulate(v,f,w,i,d);
@ -2260,27 +2223,8 @@ move_if_no_collision(Vertex_handle v, const Point &p) {
{
int d;
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr< int > maxd_ptr;
static boost::thread_specific_ptr< std::vector<Face_handle> > f_ptr;
static boost::thread_specific_ptr< std::vector<int> > i_ptr;
static boost::thread_specific_ptr< std::vector<Vertex_handle> > w_ptr;
if (maxd_ptr.get() == NULL) {
maxd_ptr.reset(new int(30));
f_ptr.reset(new std::vector<Face_handle>(*maxd_ptr));
i_ptr.reset(new std::vector<int>(*maxd_ptr));
w_ptr.reset(new std::vector<Vertex_handle>(*maxd_ptr));
}
int& maxd=*maxd_ptr;
std::vector<Face_handle>& f=*f_ptr;
std::vector<int>& i=*i_ptr;
std::vector<Vertex_handle>& w=*w_ptr;
#else
static int maxd=30;
static std::vector<Face_handle> f(maxd);
static std::vector<int> i(maxd);
static std::vector<Vertex_handle> w(maxd);
#endif
#include "Delaunay_triangulation_2_tls.h"
remove_degree_init(v,f,w,i,d,maxd);
remove_degree_triangulate(v,f,w,i,d);
}
@ -2494,27 +2438,7 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v,
{
#ifdef CGAL_HAS_THREADS
static boost::thread_specific_ptr< int > maxd_ptr;
static boost::thread_specific_ptr< std::vector<Face_handle> > f_ptr;
static boost::thread_specific_ptr< std::vector<int> > i_ptr;
static boost::thread_specific_ptr< std::vector<Vertex_handle> > w_ptr;
if (maxd_ptr.get() == NULL) {
maxd_ptr.reset(new int(30));
f_ptr.reset(new std::vector<Face_handle>(*maxd_ptr));
i_ptr.reset(new std::vector<int>(*maxd_ptr));
w_ptr.reset(new std::vector<Vertex_handle>(*maxd_ptr));
}
int& maxd=*maxd_ptr;
std::vector<Face_handle>& f=*f_ptr;
std::vector<int>& i=*i_ptr;
std::vector<Vertex_handle>& w=*w_ptr;
#else
static int maxd=30;
static std::vector<Face_handle> f(maxd);
static std::vector<int> i(maxd);
static std::vector<Vertex_handle> w(maxd);
#endif
#include "Delaunay_triangulation_2_tls.h"
int d;
remove_degree_init(v,f,w,i,d,maxd);
remove_degree_triangulate(v,f,w,i,d);

7
Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h Normal file
View File

@ -0,0 +1,7 @@
static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, std::vector<Face_handle>(maxd));
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, std::vector<int>(maxd));
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, std::vector<Vertex_handle>(maxd));