Mercurial > hg > octave-nkf
view src/c-file-ptr-stream.cc @ 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 | 9a498efac5f1 |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 2000-2011 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include "c-file-ptr-stream.h" #ifndef SEEK_SET #define SEEK_SET 0 #endif #ifndef SEEK_CUR #define SEEK_CUR 1 #endif #ifndef SEEK_END #define SEEK_END 2 #endif c_file_ptr_buf::~c_file_ptr_buf (void) { buf_close (); } // FIXME -- I'm sure there is room for improvement here... c_file_ptr_buf::int_type c_file_ptr_buf::overflow (int_type c) { #if defined (CXX_ISO_COMPLIANT_LIBRARY) if (f) return (c != traits_type::eof ()) ? gnulib::fputc (c, f) : flush (); else return traits_type::not_eof (c); #else if (f) return (c != EOF) ? gnulib::fputc (c, f) : flush (); else return EOF; #endif } c_file_ptr_buf::int_type c_file_ptr_buf::underflow_common (bool bump) { if (f) { int_type c = gnulib::fgetc (f); if (! bump #if defined (CXX_ISO_COMPLIANT_LIBRARY) && c != traits_type::eof ()) #else && c != EOF) #endif ungetc (c, f); return c; } else #if defined (CXX_ISO_COMPLIANT_LIBRARY) return traits_type::eof (); #else return EOF; #endif } c_file_ptr_buf::int_type c_file_ptr_buf::pbackfail (int_type c) { #if defined (CXX_ISO_COMPLIANT_LIBRARY) return (c != traits_type::eof () && f) ? ungetc (c, f) : traits_type::not_eof (c); #else return (c != EOF && f) ? ungetc (c, f) : EOF; #endif } std::streamsize c_file_ptr_buf::xsputn (const char* s, std::streamsize n) { if (f) return gnulib::fwrite (s, 1, n, f); else return 0; } std::streamsize c_file_ptr_buf::xsgetn (char *s, std::streamsize n) { if (f) return gnulib::fread (s, 1, n, f); else return 0; } static inline int seekdir_to_whence (std::ios::seekdir dir) { return ((dir == std::ios::beg) ? SEEK_SET : (dir == std::ios::cur) ? SEEK_CUR : (dir == std::ios::end) ? SEEK_END : dir); } std::streampos c_file_ptr_buf::seekoff (std::streamoff /* offset */, std::ios::seekdir /* dir */, std::ios::openmode) { // FIXME #if 0 if (f) { fseek (f, offset, seekdir_to_whence (dir)); return ftell (f); } else return 0; #endif return -1; } std::streampos c_file_ptr_buf::seekpos (std::streampos /* offset */, std::ios::openmode) { // FIXME #if 0 if (f) { fseek (f, offset, SEEK_SET); return ftell (f); } else return 0; #endif return -1; } int c_file_ptr_buf::sync (void) { flush (); return 0; } int c_file_ptr_buf::flush (void) { return f ? gnulib::fflush (f) : EOF; } int c_file_ptr_buf::buf_close (void) { int retval = -1; flush (); if (f) { retval = cf (f); f = 0; } return retval; } int c_file_ptr_buf::seek (long offset, int origin) { return f ? gnulib::fseek (f, offset, origin) : -1; } long c_file_ptr_buf::tell (void) { return f ? gnulib::ftell (f) : -1; } int c_file_ptr_buf::file_close (FILE *f) { return gnulib::fclose (f); } #ifdef HAVE_ZLIB c_zfile_ptr_buf::~c_zfile_ptr_buf (void) { buf_close (); } // FIXME -- I'm sure there is room for improvement here... c_zfile_ptr_buf::int_type c_zfile_ptr_buf::overflow (int_type c) { #if defined (CXX_ISO_COMPLIANT_LIBRARY) if (f) return (c != traits_type::eof ()) ? gzputc (f, c) : flush (); else return traits_type::not_eof (c); #else if (f) return (c != EOF) ? gzputc (f, c) : flush (); else return EOF; #endif } c_zfile_ptr_buf::int_type c_zfile_ptr_buf::underflow_common (bool bump) { if (f) { int_type c = gzgetc (f); if (! bump #if defined (CXX_ISO_COMPLIANT_LIBRARY) && c != traits_type::eof ()) #else && c != EOF) #endif gzungetc (c, f); return c; } else #if defined (CXX_ISO_COMPLIANT_LIBRARY) return traits_type::eof (); #else return EOF; #endif } c_zfile_ptr_buf::int_type c_zfile_ptr_buf::pbackfail (int_type c) { #if defined (CXX_ISO_COMPLIANT_LIBRARY) return (c != traits_type::eof () && f) ? gzungetc (c, f) : traits_type::not_eof (c); #else return (c != EOF && f) ? gzungetc (c, f) : EOF; #endif } std::streamsize c_zfile_ptr_buf::xsputn (const char* s, std::streamsize n) { if (f) return gzwrite (f, s, n); else return 0; } std::streamsize c_zfile_ptr_buf::xsgetn (char *s, std::streamsize n) { if (f) return gzread (f, s, n); else return 0; } std::streampos c_zfile_ptr_buf::seekoff (std::streamoff /* offset */, std::ios::seekdir /* dir */, std::ios::openmode) { // FIXME #if 0 if (f) { gzseek (f, offset, seekdir_to_whence (dir)); return gztell (f); } else return 0; #endif return -1; } std::streampos c_zfile_ptr_buf::seekpos (std::streampos /* offset */, std::ios::openmode) { // FIXME #if 0 if (f) { gzseek (f, offset, SEEK_SET); return gztell (f); } else return 0; #endif return -1; } int c_zfile_ptr_buf::sync (void) { flush (); return 0; } int c_zfile_ptr_buf::flush (void) { // FIXME -- do we need something more complex here, passing // something other than 0 for the second argument to gzflush and // checking the return value, etc.? return f ? gzflush (f, 0) : EOF; } int c_zfile_ptr_buf::buf_close (void) { int retval = -1; flush (); if (f) { retval = cf (f); f = 0; } return retval; } #endif