annotate liboctave/oct-shlib.cc @ 5864:e884ab4f29ee

[project @ 2006-06-22 00:57:27 by jwe]
author jwe
date Thu, 22 Jun 2006 00:57:28 +0000
parents faafc2d98b8d
children 8d285942fc3c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
3 Copyright (C) 1999 John W. Eaton
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
4
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
6
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
9 Free Software Foundation; either version 2, or (at your option) any
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
10 later version.
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
11
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
15 for more details.
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
16
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, write to the Free
5307
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 4429
diff changeset
19 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
4c8a2e4e0717 [project @ 2005-04-26 19:24:27 by jwe]
jwe
parents: 4429
diff changeset
20 02110-1301, USA.
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
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
25 #include <config.h>
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
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
28 #if defined (HAVE_SHL_LOAD_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
29 #include <cerrno>
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
30 #include <cstring>
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
31 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
32
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
33 #if defined (HAVE_DYLD_API)
4429
c1f6200b5f0e [project @ 2003-06-17 04:36:08 by jwe]
jwe
parents: 4193
diff changeset
34 #include <mach-o/dyld.h>
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
35 #endif
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
36
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
37 extern "C"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
38 {
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
39 #if defined (HAVE_DLOPEN_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
40 #if defined (HAVE_DLFCN_H)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
41 #include <dlfcn.h>
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
42 #else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
43 extern void *dlopen (const char *, int);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
44 extern const char *dlerror (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
45 extern void *dlsym (void *, const char *);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
46 extern int dlclose (void *);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
47 #endif
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
48 #elif defined (HAVE_SHL_LOAD_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
49 #include <dl.h>
5451
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
50 #elif defined (HAVE_LOADLIBRARY_API)
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
51 #include <windows.h>
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
52 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
53 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
54
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
55 #include "file-stat.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
56 #include "lo-error.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
57 #include "oct-shlib.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
58 #include "str-vec.h"
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
59
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
60 class
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
61 octave_base_shlib : public octave_shlib
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
62 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
63 public:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
64
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
65 octave_base_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
66 : octave_shlib (octave_xshlib ()), file (), fcn_names (),
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
67 tm_loaded (static_cast<time_t> (0))
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
68 { count = 1; }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
69
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
70 octave_base_shlib (const std::string& f)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
71 : octave_shlib (octave_xshlib ()), file (f), fcn_names (),
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
72 tm_loaded (static_cast<time_t> (0))
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
73 { count = 1; }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
74
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
75 ~octave_base_shlib (void) { }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
76
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
77 void open (const std::string&) { }
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
78
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
79 void *search (const std::string&, name_mangler = 0) { return 0; }
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
80
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
81 void close (octave_shlib::close_hook = 0) { }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
82
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
83 bool remove (const std::string& fcn_name);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
84
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
85 bool is_open (void) const { return false; }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
86
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
87 bool is_out_of_date (void) const;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
88
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
89 int number_of_functions_loaded (void) const { return fcn_names.length (); }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
90
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
91 std::string file_name (void) const { return file; }
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
92
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
93 octave_time time_loaded (void) const { return tm_loaded; }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
94
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
95 protected:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
96
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
97 std::string file;
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
98
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
99 string_vector fcn_names;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
100
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
101 octave_time tm_loaded;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
102
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
103 void stamp_time (void);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
104
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
105 void add_to_fcn_names (const std::string& name);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
106
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
107 void do_close_hook (octave_shlib::close_hook = 0);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
108
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
109 void tabula_rasa (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
110
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
111 // No copying!
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
112
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
113 octave_base_shlib (const octave_base_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
114
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
115 octave_base_shlib& operator = (const octave_base_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
116 };
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
117
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
118 bool
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
119 octave_base_shlib::remove (const std::string& fcn_name)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
120 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
121 bool retval = false;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
122
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
123 int n = number_of_functions_loaded ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
124
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
125 string_vector new_fcn_names (n);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
126
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
127 int k = 0;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
128
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
129 for (int i = 0; i < n; i++)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
130 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
131 if (fcn_names(i) == fcn_name)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
132 retval = true;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
133 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
134 new_fcn_names(k++) = fcn_names(i);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
135 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
136
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
137 new_fcn_names.resize (k);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
138
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
139 fcn_names = new_fcn_names;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
140
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
141 return retval;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
142 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
143
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
144 bool
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
145 octave_base_shlib::is_out_of_date (void) const
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
146 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
147 file_stat fs (file);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
148
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
149 return fs.is_newer (tm_loaded);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
150 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
151
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
152 void
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
153 octave_base_shlib::stamp_time (void)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
154 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
155 tm_loaded.stamp ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
156
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
157 file_stat fs (file);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
158
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
159 if (fs.is_newer (tm_loaded))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
160 (*current_liboctave_warning_with_id_handler)
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
161 ("Octave:warn-future-time-stamp",
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
162 "timestamp on file %s is in the future", file.c_str ());
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
163 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
164
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
165 void
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
166 octave_base_shlib::add_to_fcn_names (const std::string& name)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
167 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
168 int n = number_of_functions_loaded ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
169
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
170 for (int i = 0; i < n; i++)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
171 if (fcn_names(i) == name)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
172 return;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
173
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
174 fcn_names.resize (n+1);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
175
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
176 fcn_names(n) = name;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
177 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
178
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
179 void
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
180 octave_base_shlib::do_close_hook (octave_shlib::close_hook cl_hook)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
181 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
182 int n = number_of_functions_loaded ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
183
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
184 for (int i = 0; i < n; i++)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
185 cl_hook (fcn_names(i));
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
186 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
187
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
188 void
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
189 octave_base_shlib::tabula_rasa (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
190 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
191 file = "";
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
192
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
193 fcn_names.resize (0);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
194
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
195 tm_loaded = static_cast<time_t> (0);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
196 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
197
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
198 #if defined (HAVE_DLOPEN_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
199
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
200 class
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
201 octave_dlopen_shlib : public octave_base_shlib
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
202 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
203 public:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
204
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
205 octave_dlopen_shlib (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
206
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
207 ~octave_dlopen_shlib (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
208
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
209 void open (const std::string& f);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
210
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
211 void *search (const std::string& name, name_mangler mangler = 0);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
212
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
213 void close (octave_shlib::close_hook cl_hook = 0);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
214
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
215 bool is_open (void) const { return (library != 0); }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
216
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
217 private:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
218
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
219 // No copying!
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
220
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
221 octave_dlopen_shlib (const octave_dlopen_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
222
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
223 octave_dlopen_shlib& operator = (const octave_dlopen_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
224
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
225 void *library;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
226 };
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
227
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
228 octave_dlopen_shlib::octave_dlopen_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
229 : octave_base_shlib (), library (0)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
230 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
231 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
232
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
233 octave_dlopen_shlib::~octave_dlopen_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
234 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
235 close ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
236 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
237
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
238 void
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
239 octave_dlopen_shlib::open (const std::string& f)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
240 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
241 if (! is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
242 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
243 file = f;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
244
4184
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
245 int flags = 0;
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
246
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
247 #if defined (RTLD_LAZY)
4193
8696ff8692fd [project @ 2002-11-20 17:19:14 by jwe]
jwe
parents: 4184
diff changeset
248 flags |= RTLD_LAZY;
4184
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
249 #endif
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
250
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
251 #if defined (RTLD_GLOBAL)
4193
8696ff8692fd [project @ 2002-11-20 17:19:14 by jwe]
jwe
parents: 4184
diff changeset
252 flags |= RTLD_GLOBAL;
4184
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
253 #endif
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
254
e4b7578e5fc7 [project @ 2002-11-15 20:58:50 by jwe]
jwe
parents: 4162
diff changeset
255 library = dlopen (file.c_str (), flags);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
256
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
257 if (library)
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
258 stamp_time ();
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
259 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
260 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
261 const char *msg = dlerror ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
262
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
263 if (msg)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
264 (*current_liboctave_error_handler) ("%s", msg);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
265 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
266 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
267 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
268 (*current_liboctave_error_handler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
269 ("shared library %s is already open", file.c_str ());
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
270 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
271
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
272 void *
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
273 octave_dlopen_shlib::search (const std::string& name,
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
274 octave_shlib::name_mangler mangler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
275 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
276 void *function = 0;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
277
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
278 if (is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
279 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
280 std::string sym_name = name;
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
281
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
282 if (mangler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
283 sym_name = mangler (name);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
284
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
285 function = dlsym (library, sym_name.c_str ());
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
286
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
287 if (function)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
288 add_to_fcn_names (name);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
289 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
290 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
291 (*current_liboctave_error_handler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
292 ("shared library %s is not open", file.c_str ());
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
293
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
294 return function;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
295 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
296
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
297 void
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
298 octave_dlopen_shlib::close (octave_shlib::close_hook cl_hook)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
299 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
300 if (is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
301 {
5864
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
302 if (cl_hook)
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
303 do_close_hook (cl_hook);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
304
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
305 dlclose (library);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
306
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
307 library = 0;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
308
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
309 tabula_rasa ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
310 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
311 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
312
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
313 #elif defined (HAVE_SHL_LOAD_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
314
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
315 class
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
316 octave_shl_load_shlib : public octave_base_shlib
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
317 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
318 public:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
319
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
320 octave_shl_load_shlib (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
321
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
322 ~octave_shl_load_shlib (void);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
323
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
324 void open (const std::string& f);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
325
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
326 void *search (const std::string& name, name_mangler mangler = 0);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
327
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
328 void close (octave_shlib::close_hook cl_hook = 0);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
329
3609
c5ba3c9d83c5 [project @ 2000-03-16 23:57:55 by jwe]
jwe
parents: 3504
diff changeset
330 bool is_open (void) const { return (library != 0); }
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
331
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
332 private:
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
333
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
334 // No copying!
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
335
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
336 octave_shl_load_shlib (const octave_shl_load_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
337
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
338 octave_shl_load_shlib& operator = (const octave_shl_load_shlib&);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
339
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
340 shl_t library;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
341 };
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
342
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
343 octave_shl_load_shlib::octave_shl_load_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
344 : octave_base_shlib (), library (0)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
345 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
346 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
347
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
348 octave_shl_load_shlib::~octave_shl_load_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
349 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
350 close ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
351 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
352
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
353 void
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
354 octave_shl_load_shlib::open (const std::string& f)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
355 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
356 if (! is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
357 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
358 file = f;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
359
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
360 library = shl_load (file.c_str (), BIND_DEFERRED, 0L);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
361
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
362 if (library)
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
363 stamp_time ();
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
364 else
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
365 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
366 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
367 (*current_liboctave_error_handler) ("%s", strerror (errno));
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
368 }
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
369 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
370 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
371 (*current_liboctave_error_handler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
372 ("shared library %s is already open", file.c_str ());
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
373 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
374
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
375 void *
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
376 octave_shl_load_shlib::search (const std::string& name,
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
377 octave_shlib::name_mangler mangler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
378 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
379 void *function = 0;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
380
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
381 if (is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
382 {
3609
c5ba3c9d83c5 [project @ 2000-03-16 23:57:55 by jwe]
jwe
parents: 3504
diff changeset
383 std::string sym_name = name;
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
384
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
385 if (mangler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
386 sym_name = mangler (name);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
387
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
388 int status = shl_findsym (&library, sym_name.c_str (),
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
389 TYPE_UNDEFINED, &function);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
390
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
391 if (status == 0)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
392 add_to_fcn_names (name);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
393 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
394 else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
395 (*current_liboctave_error_handler)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
396 ("shared library %s is not open", file.c_str ());
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
397
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
398 return function;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
399 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
400
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
401 void
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
402 octave_shl_load_shlib::close (octave_shlib::close_hook cl_hook)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
403 {
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
404 if (is_open ())
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
405 {
5864
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
406 if (cl_hook)
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
407 do_close_hook (cl_hook);
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
408
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
409 shl_unload (library);
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
410
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
411 library = 0;
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
412
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
413 tabula_rasa ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
414 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
415 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
416
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
417 #elif defined (HAVE_LOADLIBRARY_API)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
418
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
419 class
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
420 octave_w32_shlib: public octave_base_shlib
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
421 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
422 public:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
423
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
424 octave_w32_shlib (void);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
425
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
426 ~octave_w32_shlib (void);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
427
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
428 void open (const std::string& f);
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
429
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
430 void *search (const std::string& name, name_mangler mangler = 0);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
431
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
432 void close (octave_shlib::close_hook cl_hook = 0);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
433
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
434 bool is_open (void) const { return (handle != 0); }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
435
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
436 private:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
437
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
438 // No copying!
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
439
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
440 octave_w32_shlib (const octave_w32_shlib&);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
441
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
442 octave_w32_shlib& operator = (const octave_w32_shlib&);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
443
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
444 HINSTANCE handle;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
445 };
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
446
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
447 octave_w32_shlib::octave_w32_shlib (void)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
448 : octave_base_shlib (), handle (0)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
449 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
450 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
451
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
452 octave_w32_shlib::~octave_w32_shlib (void)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
453 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
454 close ();
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
455 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
456
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
457 void
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
458 octave_w32_shlib::open (const std::string& f)
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
459 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
460 if (! is_open ())
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
461 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
462 file = f;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
463
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
464 handle = LoadLibrary (file.c_str ());
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
465
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
466 if (handle != NULL)
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
467 stamp_time ();
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
468 else
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
469 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
470 DWORD lastError = GetLastError ();
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
471 char *msg;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
472
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
473 switch (lastError)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
474 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
475 case ERROR_MOD_NOT_FOUND:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
476 case ERROR_DLL_NOT_FOUND:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
477 msg = "could not find library or dependents";
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
478 break;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
479
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
480 case ERROR_INVALID_DLL:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
481 msg = "library or its dependents are damaged";
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
482 break;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
483
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
484 case ERROR_DLL_INIT_FAILED:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
485 msg = "library initialization routine failed";
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
486 break;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
487
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
488 default:
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
489 msg = "library open failed";
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
490 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
491
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
492 (*current_liboctave_error_handler) ("%s: %s", msg, file.c_str ());
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
493 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
494 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
495 else
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
496 (*current_liboctave_error_handler)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
497 ("shared library %s is already open", file.c_str ());
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
498 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
499
5451
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
500 extern "C"
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
501 {
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
502 void * octave_w32_search (HINSTANCE handle, const char * name);
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
503 }
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
504
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
505 void *
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
506 octave_w32_shlib::search (const std::string& name,
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
507 octave_shlib::name_mangler mangler)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
508 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
509 void *function = 0;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
510
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
511 if (is_open ())
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
512 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
513 std::string sym_name = name;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
514
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
515 if (mangler)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
516 sym_name = mangler (name);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
517
5451
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe]
jwe
parents: 5307
diff changeset
518 function = octave_w32_library_search (handle, sym_name.c_str ());
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
519
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
520 if (function)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
521 add_to_fcn_names (name);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
522 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
523 else
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
524 (*current_liboctave_error_handler)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
525 ("shared library %s is not open", file.c_str ());
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
526
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
527 return function;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
528 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
529
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
530 void
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
531 octave_w32_shlib::close (octave_shlib::close_hook cl_hook)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
532 {
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
533 if (is_open ())
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
534 {
5864
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
535 if (cl_hook)
e884ab4f29ee [project @ 2006-06-22 00:57:27 by jwe]
jwe
parents: 5781
diff changeset
536 do_close_hook (cl_hook);
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
537
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
538 FreeLibrary (handle);
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
539
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
540 handle = 0;
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
541
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
542 tabula_rasa ();
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
543 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
544 }
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
545
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
546 #elif defined (HAVE_DYLD_API)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
547
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
548 class
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
549 octave_dyld_shlib : public octave_base_shlib
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
550 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
551 public:
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
552
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
553 octave_dyld_shlib (void);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
554
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
555 ~octave_dyld_shlib (void);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
556
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
557 void open (const std::string& f);
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
558
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
559 void *search (const std::string& name, name_mangler mangler = 0);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
560
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
561 void close (octave_shlib::close_hook cl_hook = 0);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
562
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
563 bool is_open (void) const {return (isOpen); }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
564
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
565 private:
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
566
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
567 // No copying!
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
568
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
569 octave_dyld_shlib (const octave_dyld_shlib&);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
570
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
571 octave_dyld_shlib& operator = (const octave_dyld_shlib&);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
572
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
573 bool isOpen;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
574 NSObjectFileImage img;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
575 NSModule handle;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
576 };
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
577
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
578 octave_dyld_shlib::octave_dyld_shlib (void)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
579 : octave_base_shlib (), isOpen (false), handle (0)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
580 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
581 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
582
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
583 octave_dyld_shlib::~octave_dyld_shlib (void)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
584 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
585 close ();
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
586 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
587
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
588 void
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
589 octave_dyld_shlib::open (const std::string& f)
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
590 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
591 int returnCode;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
592
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
593 if (! is_open ())
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
594 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
595 file = f;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
596
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
597 returnCode = NSCreateObjectFileImageFromFile (file.c_str (), &img);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
598
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
599 if (NSObjectFileImageSuccess == returnCode)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
600 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
601 handle = NSLinkModule (img, file.c_str (),
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
602 (NSLINKMODULE_OPTION_RETURN_ON_ERROR
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
603 | NSLINKMODULE_OPTION_PRIVATE));
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
604 if (handle)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
605 {
5781
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe]
jwe
parents: 5775
diff changeset
606 stamp_time ();
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
607 isOpen = true;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
608 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
609 else
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
610 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
611 (*current_liboctave_error_handler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
612 ("couldn't link module %s", file.c_str ());
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
613 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
614 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
615 else
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
616 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
617 (*current_liboctave_error_handler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
618 ("got NSObjectFileImageReturnCode %d", returnCode);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
619
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5451
diff changeset
620 // FIXME -- should use NSLinkEditError () to get
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
621 // more info on what went wrong.
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
622 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
623 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
624 else
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
625 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
626 (*current_liboctave_error_handler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
627 ("bundle %s is already open", file.c_str ());
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
628 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
629 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
630
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
631 void *
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
632 octave_dyld_shlib::search (const std::string& name,
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
633 octave_shlib::name_mangler mangler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
634 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
635 void *function = 0;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
636
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
637 if (is_open ())
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
638 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
639 std::string sym_name = name;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
640
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
641 if (mangler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
642 sym_name = mangler (name);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
643
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
644 NSSymbol symbol = NSLookupSymbolInModule (handle, sym_name.c_str ());
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
645
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
646 if (symbol)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
647 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
648 function = NSAddressOfSymbol (symbol);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
649 add_to_fcn_names (name);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
650 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
651 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
652 else
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
653 (*current_liboctave_error_handler)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
654 ("bundle %s is not open", file.c_str ());
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
655
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
656 return function;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
657 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
658
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
659 void
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
660 octave_dyld_shlib::close (octave_shlib::close_hook cl_hook)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
661 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
662 if (is_open ())
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
663 {
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
664 do_close_hook (cl_hook);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
665
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
666 NSUnLinkModule (handle, NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES);
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
667
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
668 handle = 0;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
669
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
670 if (NSDestroyObjectFileImage (img))
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
671 isOpen = false;
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
672
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
673 tabula_rasa ();
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
674 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
675 }
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
676
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
677 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
678
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
679 octave_shlib *
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
680 octave_shlib::make_shlib (void)
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
681 {
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
682 #if defined (HAVE_DLOPEN_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
683 return new octave_dlopen_shlib ();
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
684 #elif defined (HAVE_SHL_LOAD_API)
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
685 return new octave_shl_load_shlib ();
4110
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
686 #elif defined (HAVE_LOADLIBRARY_API)
b9238356dd07 [project @ 2002-10-17 16:14:44 by jwe]
jwe
parents: 4051
diff changeset
687 return new octave_w32_shlib ();
4162
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
688 #elif defined (HAVE_DYLD_API)
bcdf1c264e08 [project @ 2002-11-10 00:34:37 by jwe]
jwe
parents: 4110
diff changeset
689 return new octave_dyld_shlib ();
3326
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
690 #else
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
691 return new octave_base_shlib ();
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
692 #endif
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
693 }
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
694
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
695 /*
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
696 ;;; Local Variables: ***
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
697 ;;; mode: C++ ***
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
698 ;;; End: ***
c19f4b9484af [project @ 1999-10-29 21:52:12 by jwe]
jwe
parents:
diff changeset
699 */