octave: liboctave/util/oct-shlib.cc annotate

annotate liboctave/util/oct-shlib.cc @ 24656:cd79f32fba85

Fix errors in changeset f0de21a6a426 (bug #50463).

author	Markus Mützel <markus.muetzel@gmx.de>
date	Wed, 31 Jan 2018 01:38:53 +0100
parents	f0de21a6a426
children	ca416267c65f

rev	line source
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	1 /*
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1999-2017 John W. Eaton
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	4 Copyright (C) 2009 VZLU Prague
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	5
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	11 (at your option) any later version.
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	16 GNU General Public License for more details.
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	17
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6123 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23795 diff changeset	20 <https://www.gnu.org/licenses/>.
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	21
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	22 */
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21661 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21236 diff changeset	25 # include "config.h"
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	26 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	27
7749 14e05160b99f reference counting for functions loaded from shared libraries John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	28 #include <map>
14e05160b99f reference counting for functions loaded from shared libraries John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	29
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	30 #if defined (HAVE_SHL_LOAD_API)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	31 # include <cerrno>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	32 # include <cstring>
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	33 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	34
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	35 #if defined (HAVE_DYLD_API)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	36 # include <mach-o/dyld.h>
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	37 #endif
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	38
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	39 extern "C"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	40 {
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	41 #if defined (HAVE_DLOPEN_API)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	42 # if defined (HAVE_DLFCN_H)
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	43 # include <dlfcn.h>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	44 # else
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	45 extern void * dlopen (const char *, int);
cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	46 extern const char * dlerror (void);
cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	47 extern void * dlsym (void , const char );
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	48 extern int dlclose (void *);
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	49 # endif
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	50 #elif defined (HAVE_SHL_LOAD_API)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	51 # include <dl.h>
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	52 #elif defined (HAVE_LOADLIBRARY_API)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21202 diff changeset	53 # define WIN32_LEAN_AND_MEAN 1
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	54 # include <windows.h>
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	55 # include <psapi.h>
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	56 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	57 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	58
22146 ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	59 #include "file-ops.h"
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	60 #include "file-stat.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	61 #include "lo-error.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	62 #include "oct-shlib.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	63 #include "str-vec.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	64
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	65 namespace octave
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	66 {
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	67 dynamic_library::dynlib_rep::dynlib_rep (const std::string& f)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	68 : count (1), file (f), tm_loaded (), fcn_names ()
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	69 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	70 instances[f] = this;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	71
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	72 if (is_out_of_date ())
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	73 (*current_liboctave_warning_with_id_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	74 ("Octave:warn-future-time-stamp",
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	75 "timestamp on file %s is in the future", file.c_str ());
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	76 }
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	77
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	78 bool
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	79 dynamic_library::dynlib_rep::is_out_of_date (void) const
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	80 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23554 diff changeset	81 sys::file_stat fs (file);
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	82 return (fs && fs.is_newer (tm_loaded));
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	83 }
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	84
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	85 void
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	86 dynamic_library::dynlib_rep::fake_reload (void)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	87 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	88 // We can't actually reload the library, but we'll pretend we did.
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23554 diff changeset	89 sys::file_stat fs (file);
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	90 if (fs && fs.is_newer (tm_loaded))
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	91 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	92 tm_loaded = fs.mtime ();
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	93
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	94 (*current_liboctave_warning_with_id_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	95 ("Octave:library-reload",
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	96 "library %s not reloaded due to existing references", file.c_str ());
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	97 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	98 }
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	99
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	100 dynamic_library::dynlib_rep *
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	101 dynamic_library::dynlib_rep::get_instance (const std::string& f, bool fake)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	102 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	103 dynlib_rep *retval = nullptr;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	104 std::map<std::string, dynlib_rep *>::iterator p = instances.find (f);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	105 if (p != instances.end ())
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	106 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	107 retval = p->second;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	108 retval->count++;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	109 if (fake)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	110 retval->fake_reload ();
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	111 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	112 else
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	113 retval = new_instance (f);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	114
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	115 return retval;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	116 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	117
23554 b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	118 std::list<std::string>
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	119 dynamic_library::dynlib_rep::function_names (void) const
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	120 {
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	121 std::list<std::string> retval;
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	122
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	123 for (const auto& p : fcn_names)
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	124 retval.push_back (p.first);
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	125
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	126 return retval;
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	127 }
b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	128
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	129 void
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	130 dynamic_library::dynlib_rep::add_fcn_name (const std::string& name)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	131 {
21862 5c67b16acc4a maint: Use C++ 'auto' keyword in some instances in liboctave. Rik <rik@octave.org> parents: 21751 diff changeset	132 auto p = fcn_names.find (name);
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	133
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	134 if (p == fcn_names.end ())
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	135 fcn_names[name] = 1;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	136 else
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	137 ++(p->second);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	138 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	139
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	140 bool
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	141 dynamic_library::dynlib_rep::remove_fcn_name (const std::string& fcn_name)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	142 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	143 bool retval = false;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	144
21862 5c67b16acc4a maint: Use C++ 'auto' keyword in some instances in liboctave. Rik <rik@octave.org> parents: 21751 diff changeset	145 auto p = fcn_names.find (fcn_name);
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	146
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	147 if (p != fcn_names.end () && --(p->second) == 0)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	148 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	149 fcn_names.erase (fcn_name);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	150 retval = true;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	151 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	152
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	153 return retval;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	154 }
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	155
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	156 std::map<std::string, dynamic_library::dynlib_rep *>
4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	157 dynamic_library::dynlib_rep::instances;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	158
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	159 dynamic_library::dynlib_rep dynamic_library::nil_rep;
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	160
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	161 #if defined (HAVE_DLOPEN_API)
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	162
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	163 class
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	164 octave_dlopen_shlib : public dynamic_library::dynlib_rep
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	165 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	166 public:
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	167
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	168 octave_dlopen_shlib (const std::string& f);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	169
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	170 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	171
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	172 octave_dlopen_shlib (const octave_dlopen_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	173
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	174 octave_dlopen_shlib& operator = (const octave_dlopen_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	175
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	176 ~octave_dlopen_shlib (void);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	177
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	178 void * search (const std::string& name,
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	179 dynamic_library::name_mangler mangler = nullptr);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	180
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	181 // FIXME: this is possibly redundant because failure to open a library will
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	182 // normally throw an exception, avoiding the construction of an invalid
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	183 // library. Leave it here for possible future use.
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	184
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	185 bool is_open (void) const
cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	186 {
cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	187 return (search_all_loaded \|\| library != nullptr);
cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	188 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	189
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	190 private:
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	191
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	192 void *library;
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	193
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	194 bool search_all_loaded;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	195 };
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	196
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	197 octave_dlopen_shlib::octave_dlopen_shlib (const std::string& f)
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	198 : dynamic_library::dynlib_rep (f), library (nullptr),
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	199 search_all_loaded (false)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	200 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	201 int flags = 0;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	202
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	203 // Use RTLD_NOW to resolve all symbols before dlopen returns.
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	204 // By using this option, dlopen will detect errors and Octave
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	205 // won't exit if there are unresolved symbols in the file we are
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	206 // loading, and we may even get a useful diagnostic.
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	207 # if defined (RTLD_NOW)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	208 flags \|= RTLD_NOW;
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	209 # endif
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	210
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	211 // Use RTLD_GLOBAL to export symbols from loaded objects so they are
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	212 // available to other subsequently loaded libraries.
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	213 # if defined (RTLD_GLOBAL)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	214 flags \|= RTLD_GLOBAL;
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 21136 diff changeset	215 # endif
20493 3f01c585f54e oct-shlib.cc: Use RTLD_GLOBAL option for dlopen Mike Miller <mtmiller@octave.org> parents: 19697 diff changeset	216
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	217 if (file.empty())
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	218 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	219 search_all_loaded = true;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	220 return;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	221 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	222
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	223 library = dlopen (file.c_str (), flags);
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	224
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	225 if (! library)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	226 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	227 const char *msg = dlerror ();
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	228
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	229 if (msg)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	230 (*current_liboctave_error_handler) ("%s: failed to load: %s",
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	231 file.c_str (), msg);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	232 else
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	233 (*current_liboctave_error_handler) ("%s: failed to load",
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	234 file.c_str ());
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	235 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	236 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	237
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	238 octave_dlopen_shlib::~octave_dlopen_shlib (void)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	239 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	240 if (library)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	241 dlclose (library);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	242 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	243
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	244 void *
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	245 octave_dlopen_shlib::search (const std::string& name,
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	246 dynamic_library::name_mangler mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	247 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	248 void *function = nullptr;
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	249
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	250 if (! is_open ())
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	251 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	252 ("shared library %s is not open", file.c_str ());
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	253
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	254 std::string sym_name = name;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	255
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	256 if (mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	257 sym_name = mangler (name);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	258
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	259 if (search_all_loaded)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	260 function = dlsym (RTLD_DEFAULT, sym_name.c_str ());
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	261 else
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	262 function = dlsym (library, sym_name.c_str ());
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	263
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	264 return function;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	265 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	266
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	267 #elif defined (HAVE_SHL_LOAD_API)
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	268
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	269 class
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	270 octave_shl_load_shlib : public dynamic_library::dynlib_rep
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	271 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	272 public:
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	273
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	274 octave_shl_load_shlib (const std::string& f);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	275
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	276 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	277
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	278 octave_shl_load_shlib (const octave_shl_load_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	279
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	280 octave_shl_load_shlib& operator = (const octave_shl_load_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	281
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	282 ~octave_shl_load_shlib (void);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	283
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	284 void * search (const std::string& name,
cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	285 dynamic_library::name_mangler mangler = 0);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	286
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	287 bool is_open (void) const { return (search_all_loaded \|\| library != 0); }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	288
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	289 private:
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	290
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	291 shl_t library;
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	292
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	293 bool search_all_loaded;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	294 };
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	295
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	296 octave_shl_load_shlib::octave_shl_load_shlib (const std::string& f)
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	297 : dynamic_library::dynlib_rep (f), library (0), search_all_loaded (false)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	298 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	299 file = f;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	300
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	301 if (file.empty())
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	302 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	303 search_all_loaded = true;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	304 return;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	305 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	306
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	307 library = shl_load (file.c_str (), BIND_IMMEDIATE, 0L);
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	308
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	309 if (! library)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	310 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	311 using namespace std; // FIXME: Why have this line?
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21876 diff changeset	312 (*current_liboctave_error_handler) ("%s", std::strerror (errno));
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	313 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	314 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	315
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	316 octave_shl_load_shlib::~octave_shl_load_shlib (void)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	317 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	318 if (library)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	319 shl_unload (library);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	320 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	321
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	322 void *
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	323 octave_shl_load_shlib::search (const std::string& name,
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	324 dynamic_library::name_mangler mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	325 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	326 void *function = nullptr;
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	327
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	328 if (! is_open ())
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	329 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	330 ("shared library %s is not open", file.c_str ());
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	331
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	332 std::string sym_name = name;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	333
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	334 if (mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	335 sym_name = mangler (name);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	336
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	337 if (search_all_loaded)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	338 int status = shl_findsym (nullptr, sym_name.c_str (),
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	339 TYPE_UNDEFINED, &function);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	340 else
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	341 int status = shl_findsym (&library, sym_name.c_str (),
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	342 TYPE_UNDEFINED, &function);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	343
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	344 return function;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	345 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	346
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	347 #elif defined (HAVE_LOADLIBRARY_API)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	348
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	349 class
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	350 octave_w32_shlib: public dynamic_library::dynlib_rep
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	351 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	352 public:
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	353
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	354 octave_w32_shlib (const std::string& f);
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	355
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	356 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	357
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	358 octave_w32_shlib (const octave_w32_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	359
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	360 octave_w32_shlib& operator = (const octave_w32_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	361
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	362 ~octave_w32_shlib (void);
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	363
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	364 void * search (const std::string& name,
cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	365 dynamic_library::name_mangler mangler = 0);
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	366
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	367 void * global_search (const std::string& sym_name);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	368
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	369 bool is_open (void) const { return (search_all_loaded \|\| handle != 0); }
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	370
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	371 private:
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	372
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	373 HINSTANCE handle;
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	374
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	375 bool search_all_loaded;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	376 };
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	377
22146 ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	378 static void
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	379 set_dll_directory (const std::string& dir = "")
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	380 {
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	381 SetDllDirectory (dir.empty () ? 0 : dir.c_str ());
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	382 }
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	383
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	384 octave_w32_shlib::octave_w32_shlib (const std::string& f)
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	385 : dynamic_library::dynlib_rep (f), handle (0), search_all_loaded (false)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	386 {
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	387 if (f.empty())
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	388 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	389 search_all_loaded = true;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	390 return;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	391 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	392
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23554 diff changeset	393 std::string dir = sys::file_ops::dirname (f);
22146 ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	394
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	395 set_dll_directory (dir);
ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	396
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	397 handle = LoadLibrary (file.c_str ());
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	398
22146 ef91e43f162a set DLL directory when loading DLLs on Windows systems (bug #48511) John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	399 set_dll_directory ();
22157 c5842206aaea maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22146 diff changeset	400
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	401 if (! handle)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	402 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	403 DWORD lastError = GetLastError ();
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	404 const char *msg;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	405
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	406 switch (lastError)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	407 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	408 case ERROR_MOD_NOT_FOUND:
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	409 case ERROR_DLL_NOT_FOUND:
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	410 msg = "could not find library or dependencies";
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	411 break;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	412
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	413 case ERROR_INVALID_DLL:
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	414 msg = "library or its dependencies are damaged";
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	415 break;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	416
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	417 case ERROR_DLL_INIT_FAILED:
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	418 msg = "library initialization routine failed";
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	419 break;
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	420
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	421 default:
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	422 msg = "library open failed";
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	423 }
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	424
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	425 (*current_liboctave_error_handler) ("%s: %s", msg, file.c_str ());
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	426 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	427 }
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	428
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	429 octave_w32_shlib::~octave_w32_shlib (void)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	430 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	431 if (handle)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	432 FreeLibrary (handle);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	433 }
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	434
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	435 void *
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	436 octave_w32_shlib::global_search (const std::string& sym_name)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	437 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	438 void *function = nullptr;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	439
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	440 HANDLE proc = GetCurrentProcess ();
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	441
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	442 if (! proc)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	443 (*current_liboctave_error_handler)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	444 ("Unable to get handle to own process.");
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	445
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	446 size_t lib_num = 64;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	447 size_t size_lib = sizeof (HMODULE);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	448 HMODULE *h_libs;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	449 DWORD bytes_all_libs;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	450 bool got_libs;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	451
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	452 // Get a list of all the libraries in own process.
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	453 h_libs = static_cast<HMODULE > (malloc (size_liblib_num));
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	454 got_libs = EnumProcessModules (proc, h_libs, size_lib*lib_num,
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	455 &bytes_all_libs);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	456 int ii = 0;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	457 while (((size_lib*lib_num) < bytes_all_libs) && ii++ < 3)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	458 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	459 lib_num = bytes_all_libs / size_lib;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	460 h_libs = static_cast<HMODULE *> (realloc (h_libs, bytes_all_libs));
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	461 got_libs = EnumProcessModules (proc, h_libs, bytes_all_libs,
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	462 &bytes_all_libs);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	463 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	464
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	465 if (got_libs)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	466 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	467 for (int i = 0; i < (bytes_all_libs / size_lib); i++)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	468 {
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	469 // Check for function in library.
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	470 function = reinterpret_cast<void *>
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	471 (GetProcAddress (h_libs[i], sym_name.c_str ()));
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	472
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	473 if (function)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	474 break;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	475 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	476 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	477
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	478 // Release the handle to the process.
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	479 CloseHandle (proc);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	480
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	481 return function;
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	482 }
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	483
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	484 void *
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	485 octave_w32_shlib::search (const std::string& name,
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	486 dynamic_library::name_mangler mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	487 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	488 void *function = nullptr;
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	489
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	490 if (! is_open ())
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	491 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	492 ("shared library %s is not open", file.c_str ());
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	493
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	494 std::string sym_name = name;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	495
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	496 if (mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	497 sym_name = mangler (name);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	498
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	499 if (search_all_loaded)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	500 function = global_search (sym_name);
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	501 else
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	502 function = reinterpret_cast<void *> (GetProcAddress (handle,
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	503 sym_name.c_str ()));
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	504
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	505 return function;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	506 }
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	507
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	508 #elif defined (HAVE_DYLD_API)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	509
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	510 class
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	511 octave_dyld_shlib : public dynamic_library::dynlib_rep
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	512 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	513 public:
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	514
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	515 octave_dyld_shlib (void);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	516
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	517 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	518
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	519 octave_dyld_shlib (const octave_dyld_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	520
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	521 octave_dyld_shlib& operator = (const octave_dyld_shlib&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	522
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	523 ~octave_dyld_shlib (void);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	524
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	525 void open (const std::string& f);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	526
23446 cd4e1ee28716 maint: Use convention 'void * fcn ()' for functions which return pointers. Rik <rik@octave.org> parents: 23220 diff changeset	527 void * search (const std::string& name,
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23696 diff changeset	528 dynamic_library::name_mangler mangler = nullptr);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	529
23554 b075b1629c26 don't use hook function in dynamic_library::dynlib_rep::close function John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	530 void close (void);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	531
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	532 bool is_open (void) const { return (search_all_loaded \|\| handle != 0); }
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	533
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	534 private:
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	535
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	536 NSObjectFileImage img;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	537 NSModule handle;
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	538
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	539 bool search_all_loaded;
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	540 };
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	541
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	542 octave_dyld_shlib::octave_dyld_shlib (const std::string& f)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	543 : dynamic_library::dynlib_rep (f), handle (0)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	544 {
24656 cd79f32fba85 Fix errors in changeset f0de21a6a426 (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24653 diff changeset	545 if (f.empty ())
24653 f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	546 (*current_liboctave_error_handler)
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	547 ("global search is not implemented for DYLD_API");
f0de21a6a426 Use new LAPACK functions in gsvd if available (bug #50463). Markus Mützel <markus.muetzel@gmx.de> parents: 24534 diff changeset	548
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	549 int returnCode = NSCreateObjectFileImageFromFile (file.c_str (), &img);
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	550
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	551 if (NSObjectFileImageSuccess != returnCode)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	552 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	553 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	554 ("got NSObjectFileImageReturnCode %d", returnCode);
9958 80432f0ee895 improve octave_shlib for safer shared libs treatment Jaroslav Hajek <highegg@gmail.com> parents: 9493 diff changeset	555
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	556 // FIXME: should use NSLinkEditError () to get
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	557 // more info on what went wrong.
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	558 }
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	559
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	560 handle = NSLinkModule (img, file.c_str (),
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	561 (NSLINKMODULE_OPTION_RETURN_ON_ERROR
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	562 \| NSLINKMODULE_OPTION_PRIVATE));
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	563 if (! handle)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	564 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	565 NSLinkEditErrors ler;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	566 int lerno;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	567 const char *file2;
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	568 const char *errstr = nullptr;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	569
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	570 NSLinkEditError (&ler, &lerno, &file2, &errstr);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	571
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	572 if (! errstr)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	573 errstr = "unspecified error";
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	574
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	575 (*current_liboctave_error_handler) ("%s: %s", file.c_str (), errstr);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	576 }
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	577 }
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	578
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	579 octave_dyld_shlib::~octave_dyld_shlib (void)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	580 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	581 if (handle)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	582 NSUnLinkModule (handle, NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	583
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	584 NSDestroyObjectFileImage (img);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	585 }
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	586
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	587 void *
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	588 octave_dyld_shlib::search (const std::string& name,
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	589 dynamic_library::name_mangler mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	590 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23446 diff changeset	591 void *function = nullptr;
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	592
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	593 if (! is_open ())
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	594 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	595 ("bundle %s is not open", file.c_str ());
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	596
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	597 std::string sym_name = name;
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	598
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	599 if (mangler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	600 sym_name = mangler (name);
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	601
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	602 NSSymbol symbol = NSLookupSymbolInModule (handle, sym_name.c_str ());
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	603
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	604 if (symbol)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	605 {
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	606 function = NSAddressOfSymbol (symbol);
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	607 }
21136 7cac4e7458f2 maint: clean up code around calls to current_liboctave_error_handler. Rik <rik@octave.org> parents: 21109 diff changeset	608
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	609 return function;
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	610 }
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	611
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	612 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	613
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	614 dynamic_library::dynlib_rep *
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	615 dynamic_library::dynlib_rep::new_instance (const std::string& f)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	616 {
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	617 #if defined (HAVE_DLOPEN_API)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	618 return new octave_dlopen_shlib (f);
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	619 #elif defined (HAVE_SHL_LOAD_API)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	620 return new octave_shl_load_shlib (f);
4110 b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe] jwe parents: 4051 diff changeset	621 #elif defined (HAVE_LOADLIBRARY_API)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	622 return new octave_w32_shlib (f);
4162 bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe] jwe parents: 4110 diff changeset	623 #elif defined (HAVE_DYLD_API)
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	624 return new octave_dyld_shlib (f);
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	625 #else
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	626 (*current_liboctave_error_handler)
6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	627 ("support for dynamically loaded libraries was unavailable or disabled when liboctave was built");
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	628 #endif
21750 6720e5a220ba use namespace for octave_shlib class John W. Eaton <jwe@octave.org> parents: 21736 diff changeset	629 }
3326 c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe] jwe parents: diff changeset	630 }

Mercurial > octave

annotate liboctave/util/oct-shlib.cc @ 24656:cd79f32fba85