Mercurial > octave
annotate libinterp/corefcn/dynamic-ld.cc @ 28125:0a88a4743096
tag mex function as supporting interleaved complex (or not)
* dynamic-ld.cc (dynamic_loader::try_load_mex): New function.
(dynamic_loader::load_mex): Call it. Check mex file for
__mx_has_interleaved_complex__ symbol and pass flag to
octave_mex_function constructor.
* ov-mex-fcn.cc (octave_mex_function::m_interleaved): New data member.
(octave_mex_function::octave_mex_function):
New arg, interleaved.
(octave_mex_function::use_interleaved_complex): New function.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 18 Feb 2020 12:50:18 -0500 |
parents | bd51beb6205e |
children | 6ec04c206ac4 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
3 // Copyright (C) 1993-2020 The Octave Project Developers |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
1 | 25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
27 # include "config.h" |
1 | 28 #endif |
29 | |
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
30 #include <iostream> |
4219 | 31 #include <list> |
32 | |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
33 #include "file-stat.h" |
6323 | 34 #include "oct-env.h" |
3325 | 35 #include "oct-time.h" |
707 | 36 |
3325 | 37 #include "defun.h" |
1352 | 38 #include "dynamic-ld.h" |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23554
diff
changeset
|
39 #include "interpreter-private.h" |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
40 #include "interpreter.h" |
7336 | 41 #include "ov-fcn.h" |
42 #include "ov-dld-fcn.h" | |
43 #include "ov-mex-fcn.h" | |
3325 | 44 #include "parse.h" |
45 #include "unwind-prot.h" | |
1352 | 46 #include "utils.h" |
707 | 47 #include "variables.h" |
1 | 48 |
5864 | 49 #define STRINGIFY(s) STRINGIFY1(s) |
50 #define STRINGIFY1(s) #s | |
51 | |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
52 namespace octave |
1664 | 53 { |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
54 void |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
55 dynamic_loader::shlibs_list::append (const dynamic_library& shl) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
56 { |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
57 m_lib_list.push_back (shl); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
58 } |
3325 | 59 |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
60 std::list<std::string> |
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
61 dynamic_loader::shlibs_list::remove (dynamic_library& shl) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
62 { |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
63 std::list<std::string> removed_fcns; |
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
64 |
25337
3ff9192b676e
use auto keyword to declare iterator variables where possible
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
65 for (auto p = m_lib_list.begin (); p != m_lib_list.end (); p++) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
66 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
67 if (*p == shl) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
68 { |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
69 m_lib_list.erase (p); |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
70 |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
71 removed_fcns = shl.close (); |
2894 | 72 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
73 break; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
74 } |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
75 } |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
76 |
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
77 return removed_fcns; |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
78 } |
2894 | 79 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
80 dynamic_library |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
81 dynamic_loader::shlibs_list::find_file (const std::string& file_name) const |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
82 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
83 dynamic_library retval; |
3321 | 84 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
85 for (const auto& lib : m_lib_list) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
86 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
87 if (lib.file_name () == file_name) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
88 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
89 retval = lib; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
90 break; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
91 } |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
92 } |
1664 | 93 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
94 return retval; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
95 } |
1664 | 96 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
97 void |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
98 dynamic_loader::shlibs_list::display (void) const |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
99 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
100 std::cerr << "current shared libraries:" << std::endl; |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
101 for (const auto& lib : m_lib_list) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
102 std::cerr << " " << lib.file_name () << std::endl; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
103 } |
1664 | 104 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
105 void |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
106 dynamic_loader::clear_function (const std::string& fcn_name) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
107 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
108 warning_with_id ("Octave:reload-forces-clear", " %s", fcn_name.c_str ()); |
2926 | 109 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
110 // FIXME: is there a way to avoid this? Can we manage the list of |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
111 // functions that are loaded in the symbol table completely outside |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
112 // of the dynamic_loader class? |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
113 |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
114 symbol_table& symtab = m_interpreter.get_symbol_table (); |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23554
diff
changeset
|
115 |
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23554
diff
changeset
|
116 symtab.clear_dld_function (fcn_name); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
117 } |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
118 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
119 void |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
120 dynamic_loader::clear (dynamic_library& oct_file) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
121 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
122 if (oct_file.number_of_functions_loaded () > 1) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
123 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
124 warning_with_id ("Octave:reload-forces-clear", |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
125 "reloading %s clears the following functions:", |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
126 oct_file.file_name ().c_str ()); |
2926 | 127 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
128 std::list<std::string> removed_fcns = m_loaded_shlibs.remove (oct_file); |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
129 |
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
130 for (const auto& fcn_name : removed_fcns) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
131 clear_function (fcn_name); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
132 } |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
133 else |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
134 { |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
135 std::list<std::string> removed_fcns = m_loaded_shlibs.remove (oct_file); |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
136 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
137 // FIXME: is there a way to avoid this? Can we manage the list |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
138 // of functions that are loaded in the symbol table completely |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
139 // outside of the dynamic_loader class? |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
140 |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
141 symbol_table& symtab = m_interpreter.get_symbol_table (); |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23554
diff
changeset
|
142 |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
143 for (const auto& fcn_name : removed_fcns) |
23599
5cb3a2bb5e1e
don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents:
23554
diff
changeset
|
144 symtab.clear_dld_function (fcn_name); |
23554
b075b1629c26
don't use hook function in dynamic_library::dynlib_rep::close function
John W. Eaton <jwe@octave.org>
parents:
23466
diff
changeset
|
145 } |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
146 } |
2894 | 147 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
148 octave_function * |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
149 dynamic_loader::load_oct (const std::string& fcn_name, |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
150 const std::string& file_name, |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
151 bool relative) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
152 { |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
153 octave_function *retval = nullptr; |
3325 | 154 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
155 unwind_protect frame; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
156 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
157 frame.protect_var (m_doing_load); |
7745
0ff0fc033f28
better handling of functions found by relative lookup
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
158 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
159 m_doing_load = true; |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
160 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
161 dynamic_library oct_file = m_loaded_shlibs.find_file (file_name); |
3325 | 162 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
163 if (oct_file && oct_file.is_out_of_date ()) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
164 clear (oct_file); |
3325 | 165 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
166 if (! oct_file) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
167 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
168 oct_file.open (file_name); |
13983
7dd7cccf0757
clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
169 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
170 if (oct_file) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
171 m_loaded_shlibs.append (oct_file); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
172 } |
707 | 173 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
174 if (! oct_file) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
175 error ("%s is not a valid shared library", file_name.c_str ()); |
2893 | 176 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
177 void *function = oct_file.search (fcn_name, name_mangler); |
3325 | 178 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
179 if (! function) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
180 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
181 // FIXME: can we determine this C mangling scheme |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
182 // automatically at run time or configure time? |
3325 | 183 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
184 function = oct_file.search (fcn_name, name_uscore_mangler); |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
185 } |
6323 | 186 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
187 if (function) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
188 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
189 octave_dld_fcn_getter f |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
190 = reinterpret_cast<octave_dld_fcn_getter> (function); |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
191 |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
192 retval = f (oct_file, relative); |
6323 | 193 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
194 if (! retval) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
195 error ("failed to install .oct file function '%s'", |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
196 fcn_name.c_str ()); |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
197 } |
3325 | 198 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
199 return retval; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
200 } |
3325 | 201 |
28125
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
202 void * |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
203 dynamic_loader::try_load_mex (dynamic_library& mex_file, |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
204 const std::string& fcn_name, bool& have_fmex) |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
205 { |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
206 // FCN_NAME is not used here, the mangler functions always return |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
207 // some form of "mexFunction". |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
208 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
209 have_fmex = false; |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
210 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
211 void *function = mex_file.search (fcn_name, mex_mangler); |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
212 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
213 if (! function) |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
214 { |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
215 // FIXME: Can we determine this C mangling scheme |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
216 // automatically at run time or configure time? |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
217 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
218 function = mex_file.search (fcn_name, mex_uscore_mangler); |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
219 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
220 if (! function) |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
221 { |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
222 function = mex_file.search (fcn_name, mex_f77_mangler); |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
223 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
224 if (function) |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
225 have_fmex = true; |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
226 } |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
227 } |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
228 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
229 return function; |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
230 } |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
231 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
232 octave_function * |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
233 dynamic_loader::load_mex (const std::string& fcn_name, |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
234 const std::string& file_name, |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
235 bool /*relative*/) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
236 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
237 unwind_protect frame; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
238 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
239 frame.protect_var (m_doing_load); |
7749
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7748
diff
changeset
|
240 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
241 m_doing_load = true; |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
242 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
243 dynamic_library mex_file = m_loaded_shlibs.find_file (file_name); |
7749
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7748
diff
changeset
|
244 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
245 if (mex_file && mex_file.is_out_of_date ()) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
246 clear (mex_file); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
247 |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
248 if (! mex_file) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
249 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
250 mex_file.open (file_name); |
7749
14e05160b99f
reference counting for functions loaded from shared libraries
John W. Eaton <jwe@octave.org>
parents:
7748
diff
changeset
|
251 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
252 if (mex_file) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
253 m_loaded_shlibs.append (mex_file); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
254 } |
3325 | 255 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
256 if (! mex_file) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
257 error ("%s is not a valid shared library", file_name.c_str ()); |
20962
3aa293be0e8d
maint: Invert simple conditionals in if/else/error paradigm.
Rik <rik@octave.org>
parents:
20831
diff
changeset
|
258 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
259 bool have_fmex = false; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
260 |
28125
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
261 void *function = try_load_mex (mex_file, fcn_name, have_fmex); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
262 |
26427
93c7fc75b103
dynamic-ld.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
263 if (! function) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
264 error ("failed to install .mex file function '%s'", fcn_name.c_str ()); |
7748 | 265 |
28125
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
266 void *symbol = mex_file.search ("__mx_has_interleaved_complex__"); |
26427
93c7fc75b103
dynamic-ld.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
267 |
28125
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
268 bool interleaved = symbol != nullptr; |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
269 |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
270 return new octave_mex_function (function, interleaved, have_fmex, |
0a88a4743096
tag mex function as supporting interleaved complex (or not)
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
271 mex_file, fcn_name); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
272 } |
20962
3aa293be0e8d
maint: Invert simple conditionals in if/else/error paradigm.
Rik <rik@octave.org>
parents:
20831
diff
changeset
|
273 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
274 bool |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
275 dynamic_loader::remove_oct (const std::string& fcn_name, |
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
276 dynamic_library& shl) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
277 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
278 bool retval = false; |
5864 | 279 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
280 // We don't need to do anything if this is called because we are in |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
281 // the process of reloading a .oct file that has changed. |
5864 | 282 |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
283 if (! m_doing_load) |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
284 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
285 retval = shl.remove (fcn_name); |
5864 | 286 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
287 if (shl.number_of_functions_loaded () == 0) |
23627
0a6e87804cab
don't use singleton pattern for dynamic_loader class
John W. Eaton <jwe@octave.org>
parents:
23599
diff
changeset
|
288 m_loaded_shlibs.remove (shl); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
289 } |
5864 | 290 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
291 return retval; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
292 } |
8832
9dddbad47122
automatically reload out of date mex files
John W. Eaton <jwe@octave.org>
parents:
7996
diff
changeset
|
293 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
294 bool |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
295 dynamic_loader::remove_mex (const std::string& fcn_name, |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
296 dynamic_library& shl) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
297 { |
26427
93c7fc75b103
dynamic-ld.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
298 // Use the same procedure as for oct files. |
93c7fc75b103
dynamic-ld.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
299 return remove_oct (fcn_name, shl); |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
300 } |
20962
3aa293be0e8d
maint: Invert simple conditionals in if/else/error paradigm.
Rik <rik@octave.org>
parents:
20831
diff
changeset
|
301 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
302 std::string |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
303 dynamic_loader::name_mangler (const std::string& name) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
304 { |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23652
diff
changeset
|
305 return 'G' + name; |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
306 } |
20555
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20428
diff
changeset
|
307 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
308 std::string |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
309 dynamic_loader::name_uscore_mangler (const std::string& name) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
310 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
311 return "_G" + name; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
312 } |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
313 |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
314 std::string |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
315 dynamic_loader::mex_mangler (const std::string&) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
316 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
317 return "mexFunction"; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
318 } |
5864 | 319 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
320 std::string |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
321 dynamic_loader::mex_uscore_mangler (const std::string&) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
322 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
323 return "_mexFunction"; |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
324 } |
6221 | 325 |
23000
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
326 std::string |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
327 dynamic_loader::mex_f77_mangler (const std::string&) |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
328 { |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
329 return STRINGIFY (F77_FUNC (mexfunction, MEXFUNCTION)); |
f981282a3bd0
move octave_dynamic_loader into octave namespace
John W. Eaton <jwe@octave.org>
parents:
22999
diff
changeset
|
330 } |
5864 | 331 } |