Mercurial > octave
diff liboctave/util/oct-shlib.h @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 01 Dec 2022 18:02:15 -0800 |
parents | e88a07dec498 |
children | 597f3ee61a48 |
line wrap: on
line diff
--- a/liboctave/util/oct-shlib.h Thu Dec 01 14:23:45 2022 -0800 +++ b/liboctave/util/oct-shlib.h Thu Dec 01 18:02:15 2022 -0800 @@ -38,179 +38,179 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class - dynamic_library - { - public: // FIXME: make this class private? - - typedef std::function<std::string (const std::string&)> name_mangler; +class +dynamic_library +{ +public: // FIXME: make this class private? - class dynlib_rep - { - public: + typedef std::function<std::string (const std::string&)> name_mangler; - dynlib_rep (void) - : m_count (1), m_fcn_names (), m_file (), m_time_loaded (OCTAVE_TIME_T ()), - m_search_all_loaded (false) - { } - - protected: + class dynlib_rep + { + public: - OCTAVE_API - dynlib_rep (const std::string& f); - - public: + dynlib_rep (void) + : m_count (1), m_fcn_names (), m_file (), m_time_loaded (OCTAVE_TIME_T ()), + m_search_all_loaded (false) + { } - virtual ~dynlib_rep (void) - { - s_instances.erase (m_file); - } + protected: - virtual bool is_open (void) const - { return false; } + OCTAVE_API + dynlib_rep (const std::string& f); + + public: - virtual void * search (const std::string&, - const name_mangler& = name_mangler ()) - { return nullptr; } - - OCTAVE_API bool is_out_of_date (void) const; - - // This method will be overridden conditionally. - static OCTAVE_API dynlib_rep * new_instance (const std::string& f); + virtual ~dynlib_rep (void) + { + s_instances.erase (m_file); + } - static OCTAVE_API dynlib_rep * get_instance (const std::string& f, bool fake); - - sys::time time_loaded (void) const - { return m_time_loaded; } + virtual bool is_open (void) const + { return false; } - std::string file_name (void) const - { return m_file; } - - std::size_t num_fcn_names (void) const { return m_fcn_names.size (); } + virtual void * search (const std::string&, + const name_mangler& = name_mangler ()) + { return nullptr; } - OCTAVE_API std::list<std::string> function_names (void) const; - - OCTAVE_API void add_fcn_name (const std::string&); + OCTAVE_API bool is_out_of_date (void) const; - OCTAVE_API bool remove_fcn_name (const std::string&); + // This method will be overridden conditionally. + static OCTAVE_API dynlib_rep * new_instance (const std::string& f); - void clear_fcn_names (void) { m_fcn_names.clear (); } - - public: + static OCTAVE_API dynlib_rep * get_instance (const std::string& f, bool fake); - refcount<octave_idx_type> m_count; - - protected: + sys::time time_loaded (void) const + { return m_time_loaded; } - OCTAVE_API void fake_reload (void); + std::string file_name (void) const + { return m_file; } - static OCTAVE_API std::map<std::string, dynlib_rep *> s_instances; + std::size_t num_fcn_names (void) const { return m_fcn_names.size (); } - // Set of hooked function names. - typedef std::map<std::string, std::size_t>::iterator fcn_names_iterator; - typedef std::map<std::string, std::size_t>::const_iterator fcn_names_const_iterator; + OCTAVE_API std::list<std::string> function_names (void) const; + + OCTAVE_API void add_fcn_name (const std::string&); - std::map<std::string, std::size_t> m_fcn_names; - std::string m_file; - sys::time m_time_loaded; - bool m_search_all_loaded; - }; + OCTAVE_API bool remove_fcn_name (const std::string&); - private: - - static OCTAVE_API dynlib_rep s_nil_rep; + void clear_fcn_names (void) { m_fcn_names.clear (); } public: - dynamic_library (void) : m_rep (&s_nil_rep) { m_rep->m_count++; } - - dynamic_library (const std::string& f, bool fake = true) - : m_rep (dynlib_rep::get_instance (f, fake)) { } + refcount<octave_idx_type> m_count; - ~dynamic_library (void) - { - if (--m_rep->m_count == 0 && m_rep != &s_nil_rep) - delete m_rep; - } - - OCTAVE_API void delete_later (void); - - dynamic_library (const dynamic_library& sl) - : m_rep (sl.m_rep) - { - m_rep->m_count++; - } + protected: - dynamic_library& operator = (const dynamic_library& sl) - { - if (m_rep != sl.m_rep) - { - if (--m_rep->m_count == 0 && m_rep != &s_nil_rep) - delete m_rep; - - m_rep = sl.m_rep; - m_rep->m_count++; - } + OCTAVE_API void fake_reload (void); - return *this; - } - - bool operator == (const dynamic_library& sl) const - { return (m_rep == sl.m_rep); } - - operator bool () const { return m_rep->is_open (); } - - void open (const std::string& f) - { *this = dynamic_library (f); } + static OCTAVE_API std::map<std::string, dynlib_rep *> s_instances; - std::list<std::string> close (void) - { - std::list<std::string> removed_fcns = m_rep->function_names (); - - m_rep->clear_fcn_names (); - - *this = dynamic_library (); - - return removed_fcns; - } - - void * search (const std::string& nm, - const name_mangler& mangler = name_mangler ()) const - { - void *f = m_rep->search (nm, mangler); - if (f) - m_rep->add_fcn_name (nm); - - return f; - } + // Set of hooked function names. + typedef std::map<std::string, std::size_t>::iterator fcn_names_iterator; + typedef std::map<std::string, std::size_t>::const_iterator fcn_names_const_iterator; - void add (const std::string& name) - { m_rep->add_fcn_name (name); } - - bool remove (const std::string& name) - { return m_rep->remove_fcn_name (name); } - - std::size_t number_of_functions_loaded (void) const - { return m_rep->num_fcn_names (); } - - bool is_out_of_date (void) const - { return m_rep->is_out_of_date (); } - - std::string file_name (void) const - { return m_rep->file_name (); } - - sys::time time_loaded (void) const - { return m_rep->time_loaded (); } - - private: - - dynlib_rep *m_rep; + std::map<std::string, std::size_t> m_fcn_names; + std::string m_file; + sys::time m_time_loaded; + bool m_search_all_loaded; }; - // FIXME: Currently must return int so that it may be used as an - // event_hook function. +private: + + static OCTAVE_API dynlib_rep s_nil_rep; + +public: + + dynamic_library (void) : m_rep (&s_nil_rep) { m_rep->m_count++; } + + dynamic_library (const std::string& f, bool fake = true) + : m_rep (dynlib_rep::get_instance (f, fake)) { } + + ~dynamic_library (void) + { + if (--m_rep->m_count == 0 && m_rep != &s_nil_rep) + delete m_rep; + } + + OCTAVE_API void delete_later (void); + + dynamic_library (const dynamic_library& sl) + : m_rep (sl.m_rep) + { + m_rep->m_count++; + } + + dynamic_library& operator = (const dynamic_library& sl) + { + if (m_rep != sl.m_rep) + { + if (--m_rep->m_count == 0 && m_rep != &s_nil_rep) + delete m_rep; + + m_rep = sl.m_rep; + m_rep->m_count++; + } + + return *this; + } + + bool operator == (const dynamic_library& sl) const + { return (m_rep == sl.m_rep); } + + operator bool () const { return m_rep->is_open (); } + + void open (const std::string& f) + { *this = dynamic_library (f); } - OCTAVE_API int release_unreferenced_dynamic_libraries (void); + std::list<std::string> close (void) + { + std::list<std::string> removed_fcns = m_rep->function_names (); + + m_rep->clear_fcn_names (); + + *this = dynamic_library (); + + return removed_fcns; + } + + void * search (const std::string& nm, + const name_mangler& mangler = name_mangler ()) const + { + void *f = m_rep->search (nm, mangler); + if (f) + m_rep->add_fcn_name (nm); + + return f; + } + + void add (const std::string& name) + { m_rep->add_fcn_name (name); } + + bool remove (const std::string& name) + { return m_rep->remove_fcn_name (name); } + + std::size_t number_of_functions_loaded (void) const + { return m_rep->num_fcn_names (); } + + bool is_out_of_date (void) const + { return m_rep->is_out_of_date (); } + + std::string file_name (void) const + { return m_rep->file_name (); } + + sys::time time_loaded (void) const + { return m_rep->time_loaded (); } + +private: + + dynlib_rep *m_rep; +}; + +// FIXME: Currently must return int so that it may be used as an +// event_hook function. + +OCTAVE_API int release_unreferenced_dynamic_libraries (void); OCTAVE_END_NAMESPACE(octave)