Mercurial > octave-nkf
comparison src/ov.h @ 13985:43cc49c7abd1
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 | c1b754d93572 |
children | 72c96de7a403 |
comparison
equal
deleted
inserted
replaced
13984:1126c2907878 | 13985:43cc49c7abd1 |
---|---|
313 | 313 |
314 void make_unique (void) | 314 void make_unique (void) |
315 { | 315 { |
316 if (rep->count > 1) | 316 if (rep->count > 1) |
317 { | 317 { |
318 --rep->count; | 318 octave_base_value *r = rep->unique_clone (); |
319 rep = rep->unique_clone (); | 319 |
320 if (--rep->count == 0) | |
321 delete rep; | |
322 | |
323 rep = r; | |
320 } | 324 } |
321 } | 325 } |
322 | 326 |
323 // This uniquifies the value if it is referenced by more than a certain | 327 // This uniquifies the value if it is referenced by more than a certain |
324 // number of shallow copies. This is useful for optimizations where we | 328 // number of shallow copies. This is useful for optimizations where we |
325 // know a certain copy, typically within a cell array, to be obsolete. | 329 // know a certain copy, typically within a cell array, to be obsolete. |
326 void make_unique (int obsolete_copies) | 330 void make_unique (int obsolete_copies) |
327 { | 331 { |
328 if (rep->count > obsolete_copies + 1) | 332 if (rep->count > obsolete_copies + 1) |
329 { | 333 { |
330 --rep->count; | 334 octave_base_value *r = rep->unique_clone (); |
331 rep = rep->unique_clone (); | 335 |
336 if (--rep->count == 0) | |
337 delete rep; | |
338 | |
339 rep = r; | |
332 } | 340 } |
333 } | 341 } |
334 | 342 |
335 // Simple assignment. | 343 // Simple assignment. |
336 | 344 |