Mercurial > octave-nkf

comparison configure.ac @ 13985:43cc49c7abd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use thread-safe atomic reference counting (GCC and MSVC). * configure.ac: New --enable-atomic-refcount argument. (octave_allocator): Fix USE_OCTAVE_ALLOCATOR variable assignment. (OCTAVE_CONFIG_INCLUDED): New macro in config.h. * oct-refcount.h (OCTREFCOUNT_ATOMIC_INCREMENT, OCTREFCOUNT_ATOMIC_INCREMENT_POST, OCTREFCOUNT_ATOMIC_DECREMENT, OCTREFCOUNT_ATOMIC_DECREMENT_POST): New macro, defined for MSVC and GCC when USE_ATOMIC_REFCOUNT is defined. (octave_refcount:operator++, octave_refcount::operator--): Use them. (octave_refcount::operator count_type): Cast returned value to volatile. (octave_refcount::direct): Remove unsafe member. * Array.h (Array::make_unique): Delete rep if refcount reaches 0. * Sparse.h (Sparse::make_unique): Delete rep if refcount reaches 0. * Array.h (Array:~Array, Array::operator=): Delete rep only when refcount is excatly 0. * Array.cc (Array::clear): Likewise. * Sparse.cc (Sparse::~Sparse, Sparse::operator=): Likewise. * SparseCmplxQR.h (SparseCmplxQR::~SparseCmplxQR, SparseCmplxQR::operator=): Likewise. * SparseQR.h (SparseQR::~SparseQR, SparseQR::operator=): Likewise. * sparse-base-chol.h (sparse_base_chol::~sparse_base_chol, sparse_base_chol::operator): Likewise. * dim-vector.h (oct-refcount.h): New included header. (dim_vector::make_unique, dim_vector::resize): Use OCTREFCOUNT_ATOMIC_DECREMENT macro and delete rep when refcount reaches 0. (dim_vector::dim_vector): Use OCTREFCOUNT_ATOMIC_INCREMENT. (dim_vector::operator=): Use OCTREFCOUNT_ATOMIC_INCREMENT and OCTREFCOUNT_ATOMIC_DECREMENT. (dim_vector::~dim_vector): Use OCTREFCOUNT_ATOMIC_DECREMENT. * oct-mutex.h (oct-refcount.h): New included header. (octave_base_mutex::count): Use octave_refcount class. * gl-render.cc (oct-refcount.h): New included header. * graphics.h.in (oct-refcount.h): Likewise. (base_property::count, base_graphics_toolkit::count, base_graphics_object::count, base_graphics_event::count): Use octave_refcount. (property::~property, property::operator=): Delete rep only when refcountn is excatly 0. * oct-map.h (octave_fields::make_unique): Delete rep when refcount reaches 0. * oct-stream.h (oct-refcount.h): New included header. (octave_base_stream::count): Use octave_refcount class. * ov.h (octave_value::make_unique): Delete rep when refcount reaches 0. * symtab.h (oct-refcount.h): New included header. (symbol_record_rep::count, fcn_info_rep::count): Use octave_refcount class. * DLD-FUNCTIONS/urlwrite.cc (oct-refcount.h): New included header. (curl_handle_rep::count): Use octave_refcount class.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 03 Dec 2011 15:19:42 +0000
parents a35d381e22b0
children 9867be070ee1
comparison
equal deleted inserted replaced
13984:1126c2907878 13985:43cc49c7abd1
169 169
170 USE_OCTAVE_ALLOCATOR=false 170 USE_OCTAVE_ALLOCATOR=false
171 AC_ARG_ENABLE(octave-allocator, 171 AC_ARG_ENABLE(octave-allocator,
172 [AS_HELP_STRING([--enable-octave-allocator], 172 [AS_HELP_STRING([--enable-octave-allocator],
173 [use the obsolete octave_allocator class for many of Octave's objects (mostly octave_value types). You probably do NOT want to enable this feature. (default is no)])], 173 [use the obsolete octave_allocator class for many of Octave's objects (mostly octave_value types). You probably do NOT want to enable this feature. (default is no)])],
174 [if test "$enableval" = yes; then USE_ALLOCATOR=true; fi], []) 174 [if test "$enableval" = yes; then USE_OCTAVE_ALLOCATOR=true; fi], [])
175 if $USE_OCTAVE_ALLOCATOR; then 175 if $USE_OCTAVE_ALLOCATOR; then
176 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, [Define to use octave_allocator class.]) 176 AC_DEFINE(USE_OCTAVE_ALLOCATOR, 1, [Define to use octave_allocator class.])
177 fi
178
179 USE_ATOMIC_REFCOUNT=false
180 AC_ARG_ENABLE(atomic-refcount,
181 [AS_HELP_STRING([--enable-atomic-refcount],
182 [use atomic operations for internal reference counting. This is required for thread-safe behavior. (default is no)])],
183 [if test "$enableval" = yes; then USE_ATOMIC_REFCOUNT=true; fi], [])
184 if $USE_ATOMIC_REFCOUNT; then
185 AC_DEFINE(USE_ATOMIC_REFCOUNT, 1, [Define to use atomic operations for reference counting.])
177 fi 186 fi
178 187
179 ### Make it possible to disable running Make in the doc directory. 188 ### Make it possible to disable running Make in the doc directory.
180 ### Useful for building on systems without TeX, for example. 189 ### Useful for building on systems without TeX, for example.
181 DOCDIR=doc 190 DOCDIR=doc
2087 /* oct-types.h */ 2096 /* oct-types.h */
2088 2097
2089 typedef OCTAVE_IDX_TYPE octave_idx_type; 2098 typedef OCTAVE_IDX_TYPE octave_idx_type;
2090 2099
2091 #include <stdint.h> 2100 #include <stdint.h>
2101
2102 /* Tag indicating octave config.h has been included */
2103 #define OCTAVE_CONFIG_INCLUDED 1
2092 ]) 2104 ])
2093 2105
2094 ### Do the substitutions in all the Makefiles. 2106 ### Do the substitutions in all the Makefiles.
2095 2107
2096 AC_SUBST(ac_config_files) 2108 AC_SUBST(ac_config_files)
2463 AC_MSG_WARN([]) 2475 AC_MSG_WARN([])
2464 2476
2465 warn_msg_printed=true 2477 warn_msg_printed=true
2466 fi 2478 fi
2467 2479
2480 if $USE_ATOMIC_REFCOUNT; then
2481 AC_MSG_WARN([])
2482 AC_MSG_WARN([Using atomic reference counting.])
2483 AC_MSG_WARN([This feature allows to access octave data safely from])
2484 AC_MSG_WARN([another thread, for instance from a GUI. However this])
2485 AC_MSG_WARN([results in a small performance penalty in the octave])
2486 AC_MSG_WARN([interpreter.])
2487 AC_MSG_WARN([])
2488 if $USE_OCTAVE_ALLOCATOR; then
2489 AC_MSG_WARN([Thread-safe behavior is not guaranteed unless you also])
2490 AC_MSG_WARN([disable the use of the octave_allocator class.])
2491 AC_MSG_WARN([])
2492 fi
2493 warn_msg_printed=true
2494 fi
2495
2468 if $warn_msg_printed; then 2496 if $warn_msg_printed; then
2469 AC_MSG_NOTICE([]) 2497 AC_MSG_NOTICE([])
2470 AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR]) 2498 AC_MSG_NOTICE([NOTE: libraries may be skipped if a library is not found OR])
2471 AC_MSG_NOTICE([NOTE: if the library on your system is missing required features.]) 2499 AC_MSG_NOTICE([NOTE: if the library on your system is missing required features.])
2472 fi 2500 fi