Mercurial > hg > octave-nkf

comparison liboctave/dim-vector.h @ 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 12df7854fa7c
children 72c96de7a403
comparison
equal deleted inserted replaced
13984:1126c2907878 13985:43cc49c7abd1
30 #include <sstream> 30 #include <sstream>
31 #include <string> 31 #include <string>
32 32
33 #include "lo-error.h" 33 #include "lo-error.h"
34 #include "lo-macros.h" 34 #include "lo-macros.h"
35 #include "oct-refcount.h"
35 36
36 // Rationale: This implementation is more tricky than Array, but the 37 // Rationale: This implementation is more tricky than Array, but the
37 // big plus is that dim_vector requires only one allocation instead of 38 // big plus is that dim_vector requires only one allocation instead of
38 // two. It is (slightly) patterned after GCC's basic_string 39 // two. It is (slightly) patterned after GCC's basic_string
39 // implementation. rep is a pointer to an array of memory, comprising 40 // implementation. rep is a pointer to an array of memory, comprising
126 127
127 void make_unique (void) 128 void make_unique (void)
128 { 129 {
129 if (count () > 1) 130 if (count () > 1)
130 { 131 {
131 --count(); 132 octave_idx_type *new_rep = clonerep ();
132 rep = clonerep (); 133
134 if (OCTREFCOUNT_ATOMIC_DECREMENT(&(count())) == 0)
135 freerep ();
136
137 rep = new_rep;
133 } 138 }
134 } 139 }
135 140
136 public: 141 public:
137 142
220 225
221 public: 226 public:
222 227
223 static octave_idx_type dim_max (void); 228 static octave_idx_type dim_max (void);
224 229
225 explicit dim_vector (void) : rep (nil_rep ()) { count()++; } 230 explicit dim_vector (void) : rep (nil_rep ())
226 231 { OCTREFCOUNT_ATOMIC_INCREMENT (&(count())); }
227 dim_vector (const dim_vector& dv) : rep (dv.rep) { count()++; } 232
233 dim_vector (const dim_vector& dv) : rep (dv.rep)
234 { OCTREFCOUNT_ATOMIC_INCREMENT (&(count())); }
228 235
229 static dim_vector alloc (int n) 236 static dim_vector alloc (int n)
230 { 237 {
231 return dim_vector (newrep (n < 2 ? 2 : n)); 238 return dim_vector (newrep (n < 2 ? 2 : n));
232 } 239 }
233 240
234 dim_vector& operator = (const dim_vector& dv) 241 dim_vector& operator = (const dim_vector& dv)
235 { 242 {
236 if (&dv != this) 243 if (&dv != this)
237 { 244 {
238 if (--count() <= 0) 245 if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0)
239 freerep (); 246 freerep ();
240 247
241 rep = dv.rep; 248 rep = dv.rep;
242 count()++; 249 OCTREFCOUNT_ATOMIC_INCREMENT (&(count()));
243 } 250 }
244 251
245 return *this; 252 return *this;
246 } 253 }
247 254
248 ~dim_vector (void) 255 ~dim_vector (void)
249 { 256 {
250 if (--count() <= 0) 257 if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0)
251 freerep (); 258 freerep ();
252 } 259 }
253 260
254 int length (void) const { return ndims (); } 261 int length (void) const { return ndims (); }
255 262
263 270
264 if (n != len) 271 if (n != len)
265 { 272 {
266 octave_idx_type *r = resizerep (n, fill_value); 273 octave_idx_type *r = resizerep (n, fill_value);
267 274
268 if (--count() <= 0) 275 if (OCTREFCOUNT_ATOMIC_DECREMENT (&(count())) == 0)
269 freerep (); 276 freerep ();
270 277
271 rep = r; 278 rep = r;
272 } 279 }
273 } 280 }