r2corba 1.6.2 → 1.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +5 -5
- data/ext/libr2tao/orb.cpp +1 -1
- data/ext/libr2tao/values.cpp +14 -14
- data/ext/libr2tao/values.h +21 -57
- data/lib/corba/cbase/Request.rb +6 -6
- data/lib/corba/cmds/base.rb +1 -1
- data/lib/corba/common/Any.rb +1 -1
- data/lib/corba/common/Values.rb +4 -4
- data/lib/corba/common/version.rb +2 -2
- data/lib/corba/jbase/Servant.rb +4 -4
- data/lib/corba/svcs/ins/cos_naming.rb +6 -6
- data/lib/corba/svcs/ins/ins.rb +33 -33
- data/lib/corba/svcs/ins/naming_service.rb +5 -5
- data/rakelib/config.rb +9 -6
- data/test/BiDirectional/client.rb +7 -7
- data/test/BiDirectional/run_test.rb +2 -2
- data/test/BiDirectional/server.rb +13 -13
- data/test/CORBA_Services/Naming/BindingIterator/client.rb +9 -9
- data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/BindingIterator/server.rb +6 -6
- data/test/CORBA_Services/Naming/Corbaname/client.rb +6 -6
- data/test/CORBA_Services/Naming/Corbaname/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/Corbaname/server.rb +8 -8
- data/test/CORBA_Services/Naming/Simple/client.rb +6 -6
- data/test/CORBA_Services/Naming/Simple/run_test.rb +2 -2
- data/test/CORBA_Services/Naming/Simple/server.rb +6 -6
- data/test/Collocation/run_test.rb +2 -2
- data/test/Collocation/test.rb +1 -1
- data/test/Connect_Timeout/client.rb +7 -7
- data/test/Connect_Timeout/run_test.rb +2 -2
- data/test/DII/client.rb +10 -10
- data/test/DII/run_test.rb +2 -2
- data/test/DII/server.rb +7 -7
- data/test/DSI/client.rb +6 -6
- data/test/DSI/run_test.rb +2 -2
- data/test/DSI/server.rb +9 -9
- data/test/Exceptions/client.rb +6 -6
- data/test/Exceptions/run_test.rb +2 -2
- data/test/Exceptions/server.rb +7 -7
- data/test/Hello/client.rb +7 -7
- data/test/Hello/run_test.rb +2 -2
- data/test/Hello/server.rb +7 -7
- data/test/IDL_Test/client.rb +9 -9
- data/test/IDL_Test/run_test.rb +2 -2
- data/test/IDL_Test/server.rb +7 -7
- data/test/IORMap/client.rb +7 -7
- data/test/IORMap/run_test.rb +2 -2
- data/test/IORMap/server.rb +9 -9
- data/test/IORTable/client.rb +7 -7
- data/test/IORTable/run_test.rb +2 -2
- data/test/IORTable/server.rb +10 -10
- data/test/Implicit_Conversion/client.rb +5 -5
- data/test/Implicit_Conversion/run_test.rb +2 -2
- data/test/Implicit_Conversion/server.rb +7 -7
- data/test/Multi_Threading/Multiple_ORB/client.rb +6 -6
- data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -2
- data/test/Multi_Threading/Multiple_ORB/server.rb +5 -5
- data/test/Multi_Threading/Simple/client.rb +6 -6
- data/test/Multi_Threading/Simple/run_test.rb +2 -2
- data/test/Multi_Threading/Simple/server.rb +8 -8
- data/test/Multi_Threading/Threads/client.rb +6 -6
- data/test/Multi_Threading/Threads/run_test.rb +2 -2
- data/test/Multi_Threading/Threads/server.rb +9 -9
- data/test/Multi_Threading/Threads/watchdog.rb +7 -7
- data/test/Multiple_Servant_Interfaces/client.rb +7 -7
- data/test/Multiple_Servant_Interfaces/run_test.rb +2 -2
- data/test/Multiple_Servant_Interfaces/server.rb +7 -7
- data/test/Nil/run_test.rb +2 -2
- data/test/Nil/test.rb +4 -4
- data/test/OBV/AbstractInterface/client.rb +9 -9
- data/test/OBV/AbstractInterface/run_test.rb +2 -2
- data/test/OBV/AbstractInterface/server.rb +7 -7
- data/test/OBV/Custom/client.rb +5 -5
- data/test/OBV/Custom/run_test.rb +2 -2
- data/test/OBV/Custom/server.rb +7 -7
- data/test/OBV/Simple/client.rb +5 -5
- data/test/OBV/Simple/run_test.rb +2 -2
- data/test/OBV/Simple/server.rb +7 -7
- data/test/OBV/Simple_Event/client.rb +5 -5
- data/test/OBV/Simple_Event/run_test.rb +2 -2
- data/test/OBV/Simple_Event/server.rb +7 -7
- data/test/OBV/Supports/client.rb +17 -17
- data/test/OBV/Supports/run_test.rb +2 -2
- data/test/OBV/Supports/server.rb +7 -7
- data/test/OBV/Tree/client.rb +6 -6
- data/test/OBV/Tree/run_test.rb +2 -2
- data/test/OBV/Tree/server.rb +7 -7
- data/test/OBV/Truncatable/client.rb +5 -5
- data/test/OBV/Truncatable/run_test.rb +2 -2
- data/test/OBV/Truncatable/server.rb +6 -6
- data/test/OBV/ValueBox/client.rb +20 -20
- data/test/OBV/ValueBox/run_test.rb +2 -2
- data/test/OBV/ValueBox/server.rb +8 -8
- data/test/Object/client.rb +6 -6
- data/test/Object/run_test.rb +2 -2
- data/test/Object/server.rb +9 -9
- data/test/POA/run_test.rb +2 -2
- data/test/POA/test.rb +4 -4
- data/test/Param_Test/client.rb +6 -6
- data/test/Param_Test/run_test.rb +2 -2
- data/test/Param_Test/server.rb +6 -6
- data/test/Performance/Simple/client.rb +6 -6
- data/test/Performance/Simple/run_test.rb +2 -2
- data/test/Performance/Simple/server.rb +7 -7
- data/test/Policies/run_test.rb +2 -2
- data/test/Policies/test.rb +4 -4
- data/test/Timeout/client.rb +11 -11
- data/test/Timeout/run_test.rb +2 -2
- data/test/Timeout/server.rb +9 -9
- data/test/lib/test.rb +5 -5
- data/test/test_runner.rb +8 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d9ded7979933239c9ec3d05ea022e0c434ad2700a1e3e4dcb5d73352d9ecf3ae
|
4
|
+
data.tar.gz: 1d515a9aae79f3ef07e3a88001d2ea9822d8396dccd24fcb9682797b8bb1f26f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f3630d3894a347182085fd461a165a93c38f4beb14e390e9042f5ca3bf7a035d37d231e5dfda5442e19100e79ff52423af6664e23eb2ea0faf7ba235fc3258ed
|
7
|
+
data.tar.gz: 509e3206ad39fb5e04df6f497a61de860ef5c3963dcbd8e93bbde6dd2cbe85ce068244c8a5dc4046d32cd5932904b2b8271de12681162f0ebb62176527fd7012
|
data/README.rdoc
CHANGED
@@ -1,7 +1,7 @@
|
|
1
|
-
{
|
2
|
-
{
|
3
|
-
{
|
4
|
-
{
|
1
|
+
{rdoc-image:https://badge.fury.io/rb/r2corba.svg}[https://rubygems.org/gems/r2corba]
|
2
|
+
{rdoc-image:https://www.codefactor.io/repository/github/remedyit/r2corba/badge}[https://www.codefactor.io/repository/github/remedyit/r2corba]
|
3
|
+
{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
|
4
|
+
{rdoc-image:https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
|
5
5
|
|
6
6
|
= R2CORBA
|
7
7
|
|
@@ -40,7 +40,7 @@ If you find a bug, please report it at the R2CORBA project's {issue tracker}[htt
|
|
40
40
|
|
41
41
|
== License
|
42
42
|
|
43
|
-
R2CORBA is Copyright (c) 2007-
|
43
|
+
R2CORBA is Copyright (c) 2007-2023 Remedy IT Expertise BV, The Netherlands.
|
44
44
|
|
45
45
|
It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
|
46
46
|
|
data/ext/libr2tao/orb.cpp
CHANGED
data/ext/libr2tao/values.cpp
CHANGED
@@ -1806,7 +1806,7 @@ VALUE r2tao_OStream_write_any_array (VALUE self, VALUE rval, VALUE offset, VALUE
|
|
1806
1806
|
ACE_NEW_THROW_EX (any_array,
|
1807
1807
|
CORBA::Any[len],
|
1808
1808
|
CORBA::NO_MEMORY());
|
1809
|
-
|
1809
|
+
std::unique_ptr<CORBA::Any[]> any_array_safe (any_array);
|
1810
1810
|
for (CORBA::ULong l=0; l<len ;++l)
|
1811
1811
|
{
|
1812
1812
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -1845,7 +1845,7 @@ VALUE r2tao_OStream_write_boolean_array (VALUE self, VALUE rval, VALUE offset, V
|
|
1845
1845
|
ACE_NEW_THROW_EX (native_array,
|
1846
1846
|
CORBA::Boolean[len],
|
1847
1847
|
CORBA::NO_MEMORY());
|
1848
|
-
|
1848
|
+
std::unique_ptr<CORBA::Boolean[]> native_array_safe (native_array);
|
1849
1849
|
for (CORBA::ULong l=0; l<len ;++l)
|
1850
1850
|
{
|
1851
1851
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -1884,7 +1884,7 @@ VALUE r2tao_OStream_write_char_array (VALUE self, VALUE rval, VALUE offset, VALU
|
|
1884
1884
|
ACE_NEW_THROW_EX (native_array,
|
1885
1885
|
CORBA::Char[len],
|
1886
1886
|
CORBA::NO_MEMORY());
|
1887
|
-
|
1887
|
+
std::unique_ptr<CORBA::Char[]> native_array_safe (native_array);
|
1888
1888
|
char* s = RSTRING_PTR (rval);
|
1889
1889
|
for (CORBA::ULong l=0; l<len ;++l)
|
1890
1890
|
{
|
@@ -1923,7 +1923,7 @@ VALUE r2tao_OStream_write_wchar_array (VALUE self, VALUE rval, VALUE offset, VAL
|
|
1923
1923
|
ACE_NEW_THROW_EX (native_array,
|
1924
1924
|
CORBA::WChar[len],
|
1925
1925
|
CORBA::NO_MEMORY());
|
1926
|
-
|
1926
|
+
std::unique_ptr<CORBA::WChar[]> native_array_safe (native_array);
|
1927
1927
|
for (CORBA::ULong l=0; l<len ;++l)
|
1928
1928
|
{
|
1929
1929
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -1962,7 +1962,7 @@ VALUE r2tao_OStream_write_octet_array (VALUE self, VALUE rval, VALUE offset, VAL
|
|
1962
1962
|
ACE_NEW_THROW_EX (native_array,
|
1963
1963
|
CORBA::Octet[len],
|
1964
1964
|
CORBA::NO_MEMORY());
|
1965
|
-
|
1965
|
+
std::unique_ptr<CORBA::Octet[]> native_array_safe (native_array);
|
1966
1966
|
unsigned char* s = (unsigned char*)RSTRING_PTR (rval);
|
1967
1967
|
for (CORBA::ULong l=0; l<len ;++l)
|
1968
1968
|
{
|
@@ -2001,7 +2001,7 @@ VALUE r2tao_OStream_write_short_array (VALUE self, VALUE rval, VALUE offset, VAL
|
|
2001
2001
|
ACE_NEW_THROW_EX (native_array,
|
2002
2002
|
CORBA::Short[len],
|
2003
2003
|
CORBA::NO_MEMORY());
|
2004
|
-
|
2004
|
+
std::unique_ptr<CORBA::Short[]> native_array_safe (native_array);
|
2005
2005
|
for (CORBA::ULong l=0; l<len ;++l)
|
2006
2006
|
{
|
2007
2007
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2040,7 +2040,7 @@ VALUE r2tao_OStream_write_ushort_array (VALUE self, VALUE rval, VALUE offset, VA
|
|
2040
2040
|
ACE_NEW_THROW_EX (native_array,
|
2041
2041
|
CORBA::UShort[len],
|
2042
2042
|
CORBA::NO_MEMORY());
|
2043
|
-
|
2043
|
+
std::unique_ptr<CORBA::UShort[]> native_array_safe (native_array);
|
2044
2044
|
for (CORBA::ULong l=0; l<len ;++l)
|
2045
2045
|
{
|
2046
2046
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2079,7 +2079,7 @@ VALUE r2tao_OStream_write_long_array (VALUE self, VALUE rval, VALUE offset, VALU
|
|
2079
2079
|
ACE_NEW_THROW_EX (native_array,
|
2080
2080
|
CORBA::Long[len],
|
2081
2081
|
CORBA::NO_MEMORY());
|
2082
|
-
|
2082
|
+
std::unique_ptr<CORBA::Long[]> native_array_safe (native_array);
|
2083
2083
|
for (CORBA::ULong l=0; l<len ;++l)
|
2084
2084
|
{
|
2085
2085
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2118,7 +2118,7 @@ VALUE r2tao_OStream_write_ulong_array (VALUE self, VALUE rval, VALUE offset, VAL
|
|
2118
2118
|
ACE_NEW_THROW_EX (native_array,
|
2119
2119
|
CORBA::ULong[len],
|
2120
2120
|
CORBA::NO_MEMORY());
|
2121
|
-
|
2121
|
+
std::unique_ptr<CORBA::ULong[]> native_array_safe (native_array);
|
2122
2122
|
for (CORBA::ULong l=0; l<len ;++l)
|
2123
2123
|
{
|
2124
2124
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2157,7 +2157,7 @@ VALUE r2tao_OStream_write_longlong_array (VALUE self, VALUE rval, VALUE offset,
|
|
2157
2157
|
ACE_NEW_THROW_EX (native_array,
|
2158
2158
|
CORBA::LongLong[len],
|
2159
2159
|
CORBA::NO_MEMORY());
|
2160
|
-
|
2160
|
+
std::unique_ptr<CORBA::LongLong[]> native_array_safe (native_array);
|
2161
2161
|
for (CORBA::ULong l=0; l<len ;++l)
|
2162
2162
|
{
|
2163
2163
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2196,7 +2196,7 @@ VALUE r2tao_OStream_write_ulonglong_array (VALUE self, VALUE rval, VALUE offset,
|
|
2196
2196
|
ACE_NEW_THROW_EX (native_array,
|
2197
2197
|
CORBA::ULongLong[len],
|
2198
2198
|
CORBA::NO_MEMORY());
|
2199
|
-
|
2199
|
+
std::unique_ptr<CORBA::ULongLong[]> native_array_safe (native_array);
|
2200
2200
|
for (CORBA::ULong l=0; l<len ;++l)
|
2201
2201
|
{
|
2202
2202
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2235,7 +2235,7 @@ VALUE r2tao_OStream_write_float_array (VALUE self, VALUE rval, VALUE offset, VAL
|
|
2235
2235
|
ACE_NEW_THROW_EX (native_array,
|
2236
2236
|
CORBA::Float[len],
|
2237
2237
|
CORBA::NO_MEMORY());
|
2238
|
-
|
2238
|
+
std::unique_ptr<CORBA::Float[]> native_array_safe (native_array);
|
2239
2239
|
for (CORBA::ULong l=0; l<len ;++l)
|
2240
2240
|
{
|
2241
2241
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2274,7 +2274,7 @@ VALUE r2tao_OStream_write_double_array (VALUE self, VALUE rval, VALUE offset, VA
|
|
2274
2274
|
ACE_NEW_THROW_EX (native_array,
|
2275
2275
|
CORBA::Double[len],
|
2276
2276
|
CORBA::NO_MEMORY());
|
2277
|
-
|
2277
|
+
std::unique_ptr<CORBA::Double[]> native_array_safe (native_array);
|
2278
2278
|
for (CORBA::ULong l=0; l<len ;++l)
|
2279
2279
|
{
|
2280
2280
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
@@ -2313,7 +2313,7 @@ VALUE r2tao_OStream_write_longdouble_array (VALUE self, VALUE rval, VALUE offset
|
|
2313
2313
|
ACE_NEW_THROW_EX (native_array,
|
2314
2314
|
CORBA::LongDouble[len],
|
2315
2315
|
CORBA::NO_MEMORY());
|
2316
|
-
|
2316
|
+
std::unique_ptr<CORBA::LongDouble[]> native_array_safe (native_array);
|
2317
2317
|
for (CORBA::ULong l=0; l<len ;++l)
|
2318
2318
|
{
|
2319
2319
|
VALUE rel = rb_ary_entry (rval, offs+l);
|
data/ext/libr2tao/values.h
CHANGED
@@ -20,6 +20,7 @@
|
|
20
20
|
#include "tao/Valuetype/Value_VarOut_T.h"
|
21
21
|
#include "tao/Objref_VarOut_T.h"
|
22
22
|
#include "tao/VarOut_T.h"
|
23
|
+
#include <memory>
|
23
24
|
|
24
25
|
extern VALUE r2tao_cBoxedValueBase;
|
25
26
|
|
@@ -37,16 +38,16 @@ public:
|
|
37
38
|
R2TAO_ArrayAny_Impl_T (CORBA::TypeCode_ptr,
|
38
39
|
T * const,
|
39
40
|
CORBA::ULong);
|
40
|
-
|
41
|
+
~R2TAO_ArrayAny_Impl_T () override;
|
41
42
|
|
42
43
|
static void insert (CORBA::Any &,
|
43
44
|
CORBA::TypeCode_ptr,
|
44
45
|
T * const,
|
45
46
|
CORBA::ULong);
|
46
47
|
|
47
|
-
|
48
|
+
CORBA::Boolean marshal_value (TAO_OutputCDR &) override;
|
48
49
|
virtual const void *value () const;
|
49
|
-
|
50
|
+
void free_value () override;
|
50
51
|
|
51
52
|
private:
|
52
53
|
void* value_;
|
@@ -62,18 +63,9 @@ private:
|
|
62
63
|
//===================================================================
|
63
64
|
|
64
65
|
class R2TAO_Value;
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
R2TAO_Value
|
69
|
-
>
|
70
|
-
R2TAO_Value_var;
|
71
|
-
|
72
|
-
typedef
|
73
|
-
TAO_Value_Out_T<
|
74
|
-
R2TAO_Value
|
75
|
-
>
|
76
|
-
R2TAO_Value_out;
|
66
|
+
using R2TAO_Value_ptr = R2TAO_Value *;
|
67
|
+
using R2TAO_Value_var = TAO_Value_Var_T<R2TAO_Value>;
|
68
|
+
using R2TAO_Value_out = TAO_Value_Out_T<R2TAO_Value>;
|
77
69
|
|
78
70
|
class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
|
79
71
|
{
|
@@ -81,7 +73,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
|
|
81
73
|
R2TAO_Value (VALUE rbValue, bool for_unmarshal=false);
|
82
74
|
~R2TAO_Value () override;
|
83
75
|
|
84
|
-
|
76
|
+
CORBA::ValueBase* _copy_value () override;
|
85
77
|
|
86
78
|
static void _tao_any_destructor (void *);
|
87
79
|
|
@@ -150,7 +142,7 @@ class R2TAO_Value : public ::CORBA::DefaultValueRefCountBase
|
|
150
142
|
|
151
143
|
CORBA::TypeCode_var val_tc_; // the typecode for the valuetype
|
152
144
|
|
153
|
-
|
145
|
+
std::unique_ptr<Chunk> chunk_list_;
|
154
146
|
Chunk* last_chunk_;
|
155
147
|
};
|
156
148
|
|
@@ -206,19 +198,9 @@ VALUE r2tao_VFB_lookup_value_factory(VALUE self, VALUE id);
|
|
206
198
|
//===================================================================
|
207
199
|
|
208
200
|
class R2TAO_AbstractValue;
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
TAO_Objref_Var_T<
|
213
|
-
R2TAO_AbstractValue
|
214
|
-
>
|
215
|
-
R2TAO_AbstractValue_var;
|
216
|
-
|
217
|
-
typedef
|
218
|
-
TAO_Objref_Out_T<
|
219
|
-
R2TAO_AbstractValue
|
220
|
-
>
|
221
|
-
R2TAO_AbstractValue_out;
|
201
|
+
using R2TAO_AbstractValue_ptr = R2TAO_AbstractValue*;
|
202
|
+
using R2TAO_AbstractValue_var = TAO_Objref_Var_T<R2TAO_AbstractValue>;
|
203
|
+
using R2TAO_AbstractValue_out = TAO_Objref_Out_T<R2TAO_AbstractValue>;
|
222
204
|
|
223
205
|
class R2TAO_AbstractValue :
|
224
206
|
public ::CORBA::AbstractBase,
|
@@ -281,19 +263,9 @@ void operator<<= (::CORBA::Any &, R2TAO_AbstractValue_ptr *); // non-copying
|
|
281
263
|
//===================================================================
|
282
264
|
|
283
265
|
class R2TAO_AbstractObject;
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
TAO_Objref_Var_T<
|
288
|
-
R2TAO_AbstractObject
|
289
|
-
>
|
290
|
-
R2TAO_AbstractObject_var;
|
291
|
-
|
292
|
-
typedef
|
293
|
-
TAO_Objref_Out_T<
|
294
|
-
R2TAO_AbstractObject
|
295
|
-
>
|
296
|
-
R2TAO_AbstractObject_out;
|
266
|
+
using R2TAO_AbstractObject_ptr = R2TAO_AbstractObject*;
|
267
|
+
using R2TAO_AbstractObject_var = TAO_Objref_Var_T<R2TAO_AbstractObject>;
|
268
|
+
using R2TAO_AbstractObject_out = TAO_Objref_Out_T<R2TAO_AbstractObject>;
|
297
269
|
|
298
270
|
class R2TAO_AbstractObject :
|
299
271
|
public ::CORBA::AbstractBase,
|
@@ -366,26 +338,18 @@ namespace TAO
|
|
366
338
|
template<>
|
367
339
|
struct Objref_Traits< R2TAO_AbstractValue>
|
368
340
|
{
|
369
|
-
static R2TAO_AbstractValue_ptr duplicate (
|
370
|
-
|
371
|
-
static void release (
|
372
|
-
R2TAO_AbstractValue_ptr p);
|
341
|
+
static R2TAO_AbstractValue_ptr duplicate (R2TAO_AbstractValue_ptr p);
|
342
|
+
static void release (R2TAO_AbstractValue_ptr p);
|
373
343
|
static R2TAO_AbstractValue_ptr nil ();
|
374
|
-
static ::CORBA::Boolean marshal (
|
375
|
-
const R2TAO_AbstractValue_ptr p,
|
376
|
-
TAO_OutputCDR & cdr);
|
344
|
+
static ::CORBA::Boolean marshal (const R2TAO_AbstractValue_ptr p, TAO_OutputCDR & cdr);
|
377
345
|
};
|
378
346
|
|
379
347
|
template<>
|
380
348
|
struct Objref_Traits< R2TAO_AbstractObject>
|
381
349
|
{
|
382
|
-
static R2TAO_AbstractObject_ptr duplicate (
|
383
|
-
|
384
|
-
static void release (
|
385
|
-
R2TAO_AbstractObject_ptr p);
|
350
|
+
static R2TAO_AbstractObject_ptr duplicate (R2TAO_AbstractObject_ptr p);
|
351
|
+
static void release (R2TAO_AbstractObject_ptr p);
|
386
352
|
static R2TAO_AbstractObject_ptr nil ();
|
387
|
-
static ::CORBA::Boolean marshal (
|
388
|
-
const R2TAO_AbstractObject_ptr p,
|
389
|
-
TAO_OutputCDR & cdr);
|
353
|
+
static ::CORBA::Boolean marshal (const R2TAO_AbstractObject_ptr p, TAO_OutputCDR & cdr);
|
390
354
|
};
|
391
355
|
}
|
data/lib/corba/cbase/Request.rb
CHANGED
@@ -79,9 +79,9 @@ module R2CORBA
|
|
79
79
|
|
80
80
|
def invoke
|
81
81
|
self._invoke({
|
82
|
-
:
|
83
|
-
:
|
84
|
-
:
|
82
|
+
arg_list: self._arguments,
|
83
|
+
result_type: @_rettc,
|
84
|
+
exc_list: self._exceptions
|
85
85
|
})
|
86
86
|
end
|
87
87
|
|
@@ -91,9 +91,9 @@ module R2CORBA
|
|
91
91
|
|
92
92
|
def send_deferred
|
93
93
|
self._send_deferred({
|
94
|
-
:
|
95
|
-
:
|
96
|
-
:
|
94
|
+
arg_list: self._arguments,
|
95
|
+
result_type: @_rettc,
|
96
|
+
exc_list: self._exceptions
|
97
97
|
})
|
98
98
|
end
|
99
99
|
|
data/lib/corba/cmds/base.rb
CHANGED
data/lib/corba/common/Any.rb
CHANGED
data/lib/corba/common/Values.rb
CHANGED
@@ -79,10 +79,10 @@ module R2CORBA
|
|
79
79
|
VM_TRUNCATABLE = 3
|
80
80
|
|
81
81
|
VT_MODIFIERS = {
|
82
|
-
:
|
83
|
-
:
|
84
|
-
:
|
85
|
-
:
|
82
|
+
none: VM_NONE,
|
83
|
+
abstract: VM_ABSTRACT,
|
84
|
+
truncatable: VM_TRUNCATABLE,
|
85
|
+
custom: VM_CUSTOM
|
86
86
|
}.freeze
|
87
87
|
|
88
88
|
PRIVATE_MEMBER = 0
|
data/lib/corba/common/version.rb
CHANGED
data/lib/corba/jbase/Servant.rb
CHANGED
@@ -44,25 +44,25 @@ module R2CORBA
|
|
44
44
|
begin
|
45
45
|
case rsrvreq.srvreq_.operation()
|
46
46
|
when '_is_a'
|
47
|
-
rsrvreq.describe({:
|
47
|
+
rsrvreq.describe({arg_list: [['', CORBA::ARG_IN, CORBA._tc_string]], result_type: CORBA._tc_boolean})
|
48
48
|
rc = self._is_a(*rsrvreq.arguments)
|
49
49
|
jany = rsrvreq.orb_.create_any()
|
50
50
|
jany.insert_boolean(rc == true)
|
51
51
|
jsrvreq.set_result(jany)
|
52
52
|
when '_non_existent'
|
53
|
-
rsrvreq.describe({:
|
53
|
+
rsrvreq.describe({arg_list: [], result_type: CORBA._tc_boolean})
|
54
54
|
rc = self._non_existent(*rsrvreq.arguments)
|
55
55
|
jany = rsrvreq.orb_.create_any()
|
56
56
|
jany.insert_boolean(rc == true)
|
57
57
|
jsrvreq.set_result(jany)
|
58
58
|
when '_repository_id'
|
59
|
-
rsrvreq.describe({:
|
59
|
+
rsrvreq.describe({arg_list: [], result_type: CORBA._tc_string})
|
60
60
|
rc = self._repository_id(*rsrvreq.arguments)
|
61
61
|
jany = rsrvreq.orb_.create_any()
|
62
62
|
jany.insert_string(rc)
|
63
63
|
jsrvreq.set_result(jany)
|
64
64
|
when '_component'
|
65
|
-
rsrvreq.describe({:
|
65
|
+
rsrvreq.describe({arg_list: [], result_type: CORBA._tc_Object})
|
66
66
|
rc = self._get_component(*rsrvreq.arguments)
|
67
67
|
jany = rsrvreq.orb_.create_any()
|
68
68
|
jany.insert_Object(rc)
|
@@ -363,9 +363,9 @@ module R2CORBA
|
|
363
363
|
@map.synchronize do
|
364
364
|
raise CosNaming::NamingContext::AlreadyBound.new if @map.has_key?(key_)
|
365
365
|
@map[key_] = {
|
366
|
-
:
|
367
|
-
:
|
368
|
-
:
|
366
|
+
name: full_name,
|
367
|
+
type: type,
|
368
|
+
object: obj
|
369
369
|
}
|
370
370
|
end
|
371
371
|
end
|
@@ -380,9 +380,9 @@ module R2CORBA
|
|
380
380
|
raise CosNaming::NamingContext::NotFound.new(why, [])
|
381
381
|
end
|
382
382
|
@map[key_] = {
|
383
|
-
:
|
384
|
-
:
|
385
|
-
:
|
383
|
+
name: full_name,
|
384
|
+
type: type,
|
385
|
+
object: obj
|
386
386
|
}
|
387
387
|
end
|
388
388
|
end
|
data/lib/corba/svcs/ins/ins.rb
CHANGED
@@ -181,14 +181,14 @@ module R2CORBA
|
|
181
181
|
report 'INS - starting daemon mode'
|
182
182
|
|
183
183
|
daemon_opt = {
|
184
|
-
:
|
185
|
-
:
|
186
|
-
:
|
187
|
-
:
|
188
|
-
:
|
189
|
-
:
|
190
|
-
:
|
191
|
-
:
|
184
|
+
app_name: 'rins',
|
185
|
+
ARGV: ['start'],
|
186
|
+
dir_mode: :normal,
|
187
|
+
dir: @options[:piddir],
|
188
|
+
multiple: true,
|
189
|
+
log_dir: @options[:logdir] || @options[:piddir],
|
190
|
+
log_output: true,
|
191
|
+
stop_proc: Proc.new do
|
192
192
|
report 'INS - shutting down'
|
193
193
|
ins_svc.shutdown
|
194
194
|
end
|
@@ -252,11 +252,11 @@ module R2CORBA
|
|
252
252
|
report 'INS - stopping service'
|
253
253
|
if @options[:daemon]
|
254
254
|
daemon_opt = {
|
255
|
-
:
|
256
|
-
:
|
257
|
-
:
|
258
|
-
:
|
259
|
-
:
|
255
|
+
app_name: 'rins',
|
256
|
+
ARGV: ['stop'],
|
257
|
+
dir_mode: :normal,
|
258
|
+
dir: @options[:piddir],
|
259
|
+
multiple: true,
|
260
260
|
}
|
261
261
|
|
262
262
|
Daemons.run_proc('ins.rb', daemon_opt) {}
|
@@ -279,14 +279,14 @@ module R2CORBA
|
|
279
279
|
report 'INS - restarting daemon mode'
|
280
280
|
|
281
281
|
daemon_opt = {
|
282
|
-
:
|
283
|
-
:
|
284
|
-
:
|
285
|
-
:
|
286
|
-
:
|
287
|
-
:
|
288
|
-
:
|
289
|
-
:
|
282
|
+
app_name: 'rins',
|
283
|
+
ARGV: ['restart'],
|
284
|
+
dir_mode: :normal,
|
285
|
+
dir: @options[:piddir],
|
286
|
+
multiple: true,
|
287
|
+
log_dir: @options[:logdir] || @options[:piddir],
|
288
|
+
log_output: true,
|
289
|
+
stop_proc: Proc.new do
|
290
290
|
report 'INS - shutting down'
|
291
291
|
ins_svc.shutdown
|
292
292
|
end
|
@@ -310,11 +310,11 @@ module R2CORBA
|
|
310
310
|
def status
|
311
311
|
report 'INS - retrieving service status'
|
312
312
|
daemon_opt = {
|
313
|
-
:
|
314
|
-
:
|
315
|
-
:
|
316
|
-
:
|
317
|
-
:
|
313
|
+
app_name: 'rins',
|
314
|
+
ARGV: ['status'],
|
315
|
+
dir_mode: :normal,
|
316
|
+
dir: @options[:piddir],
|
317
|
+
multiple: true,
|
318
318
|
}
|
319
319
|
|
320
320
|
Daemons.run_proc('ins.rb', daemon_opt) {}
|
@@ -351,13 +351,13 @@ module R2CORBA
|
|
351
351
|
end
|
352
352
|
|
353
353
|
OPTIONS = {
|
354
|
-
:
|
355
|
-
:
|
356
|
-
:
|
357
|
-
:
|
358
|
-
:
|
359
|
-
:
|
360
|
-
:
|
354
|
+
piddir: Dir.getwd,
|
355
|
+
iorfile: 'ins.ior',
|
356
|
+
debug: 0,
|
357
|
+
logdir: nil,
|
358
|
+
threads: 5,
|
359
|
+
orbprop: {},
|
360
|
+
port: 0,
|
361
361
|
}
|
362
362
|
|
363
363
|
COMMANDS = [
|
@@ -18,11 +18,11 @@ module R2CORBA
|
|
18
18
|
class Service
|
19
19
|
# default options
|
20
20
|
OPTIONS = {
|
21
|
-
:
|
22
|
-
:
|
23
|
-
:
|
24
|
-
:
|
25
|
-
:
|
21
|
+
iorfile: 'ins.ior',
|
22
|
+
debug: 0,
|
23
|
+
threads: 5,
|
24
|
+
orbprop: {},
|
25
|
+
port: 0
|
26
26
|
}
|
27
27
|
|
28
28
|
def initialize(options = {})
|
data/rakelib/config.rb
CHANGED
@@ -346,10 +346,12 @@ module R2CORBA
|
|
346
346
|
|
347
347
|
@@ridlc = File.join('bin', 'ridlc')
|
348
348
|
|
349
|
-
# check availability of RIDL; either as gem or in subdir
|
350
|
-
|
349
|
+
# check availability of RIDL; either as gem or in ridl subdir, or to a location as set
|
350
|
+
# in the RIDL_ROOT environment variable
|
351
|
+
ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
|
352
|
+
if (@@ridl_local = File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')))
|
351
353
|
incdirs = [
|
352
|
-
File.expand_path(File.join('
|
354
|
+
File.expand_path(File.join(ENV['RIDL_ROOT'], 'lib')),
|
353
355
|
File.expand_path('lib'),
|
354
356
|
ENV['RUBYLIB']
|
355
357
|
].compact
|
@@ -513,9 +515,10 @@ module R2CORBA
|
|
513
515
|
end
|
514
516
|
end
|
515
517
|
|
516
|
-
# check availability of RIDL; either as gem or in subdir
|
517
|
-
|
518
|
-
|
518
|
+
# check availability of RIDL; either as gem or in subdir or as set in RIDL_ROOT
|
519
|
+
ENV['RIDL_ROOT'] ||= File.expand_path('ridl')
|
520
|
+
unless File.exist?(File.join(ENV['RIDL_ROOT'], 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
|
521
|
+
raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in the subdirectory ridl, or at the location as set by RIDL_ROOT.'
|
519
522
|
end
|
520
523
|
end
|
521
524
|
|
@@ -12,9 +12,9 @@ require 'lib/assert.rb'
|
|
12
12
|
include TestUtil::Assertions
|
13
13
|
|
14
14
|
OPTIONS = {
|
15
|
-
:
|
16
|
-
:
|
17
|
-
:
|
15
|
+
use_implement: false,
|
16
|
+
orb_debuglevel: 0,
|
17
|
+
iorfile: 'file://server.ior'
|
18
18
|
}
|
19
19
|
|
20
20
|
ARGV.options do |opts|
|
@@ -96,7 +96,7 @@ begin
|
|
96
96
|
|
97
97
|
puts 'child_poa created'
|
98
98
|
|
99
|
-
policies.each { |pol| pol.destroy
|
99
|
+
policies.each { |pol| pol.destroy }
|
100
100
|
|
101
101
|
puts 'policies destroyed'
|
102
102
|
|
@@ -110,7 +110,7 @@ begin
|
|
110
110
|
|
111
111
|
callback_i = MyCallback.new(orb)
|
112
112
|
|
113
|
-
callback_ref = callback_i._this
|
113
|
+
callback_ref = callback_i._this
|
114
114
|
|
115
115
|
# Send the calback object to the server
|
116
116
|
simple_srv.callback_object(callback_ref)
|
@@ -120,12 +120,12 @@ begin
|
|
120
120
|
|
121
121
|
assert "unexpected result = #{r}", r == 0
|
122
122
|
|
123
|
-
orb.run
|
123
|
+
orb.run
|
124
124
|
|
125
125
|
root_poa.destroy(1, 1)
|
126
126
|
|
127
127
|
ensure
|
128
128
|
|
129
|
-
orb.destroy
|
129
|
+
orb.destroy
|
130
130
|
|
131
131
|
end
|