Mercurial > hg > octave-lyh

comparison liboctave/Array.cc @ 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 e81ddf9cacd5
children 72c96de7a403
comparison
equal deleted inserted replaced
13984:1126c2907878 13985:43cc49c7abd1
82 82
83 template <class T> 83 template <class T>
84 void 84 void
85 Array<T>::clear (void) 85 Array<T>::clear (void)
86 { 86 {
87 if (--rep->count <= 0) 87 if (--rep->count == 0)
88 delete rep; 88 delete rep;
89 89
90 rep = nil_rep (); 90 rep = nil_rep ();
91 rep->count++; 91 rep->count++;
92 slice_data = rep->data; 92 slice_data = rep->data;
97 97
98 template <class T> 98 template <class T>
99 void 99 void
100 Array<T>::clear (const dim_vector& dv) 100 Array<T>::clear (const dim_vector& dv)
101 { 101 {
102 if (--rep->count <= 0) 102 if (--rep->count == 0)
103 delete rep; 103 delete rep;
104 104
105 rep = new ArrayRep (dv.safe_numel ()); 105 rep = new ArrayRep (dv.safe_numel ());
106 slice_data = rep->data; 106 slice_data = rep->data;
107 slice_len = rep->len; 107 slice_len = rep->len;