r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

data/test/Multi_Threading/Threads/Test.idl

@@ -1,31 +1,31 @@
-//
-// $Id: Test.idl 199 2011-01-14 16:53:02Z martin $
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ();
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-
-  interface Watchdog
-  {
-    void ping( in string name );
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-};
+//
+// $Id: Test.idl 199 2011-01-14 16:53:02Z martin $
+//
+
+/// Put the interfaces in a module, to avoid global namespace pollution
+module Test
+{
+  /// A very simple interface
+  interface Hello
+  {
+    /// Return a simple string
+    string get_string ();
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+
+  interface Watchdog
+  {
+    void ping( in string name );
+
+    /// A method to shutdown the ORB
+    /**
+     * This method is used to simplify the test shutdown process
+     */
+    oneway void shutdown ();
+  };
+};

data/test/Multi_Threading/Threads/client.rb

@@ -1,80 +1,80 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# $Id: client.rb 279 2011-02-08 09:53:28Z martin $
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# included with this program.
-#
-# Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
-#--------------------------------------------------------------------
-
-require 'optparse'
-require 'lib/assert.rb'
-include TestUtil::Assertions
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'file://server.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    opts.on("--k IORFILE",
-            "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
-
-    opts.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba'
-  CORBA.implement('Test.idl', OPTIONS)
-else
-  require 'TestC.rb'
-end
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-begin
-    
-  obj = orb.string_to_object(OPTIONS[:iorfile])
-  
-  hello_obj = Test::Hello._narrow(obj)
-  
-  hello_strings = (1..10000).map {hello_obj.get_string}
-
-  puts "Client - got #{hello_strings.length} strings."
-
-  hello_obj.shutdown()
-  
-  assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
-  
-  hello_obj._free_ref()
-  
-  assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
-
-ensure
-    
-  orb.destroy()
-
-end
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# $Id: client.rb 279 2011-02-08 09:53:28Z martin $
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the R2CORBA LICENSE which is
+# included with this program.
+#
+# Copyright (c) Remedy IT Expertise BV
+# Chamber of commerce Rotterdam nr.276339, The Netherlands
+#--------------------------------------------------------------------
+
+require 'optparse'
+require 'lib/assert.rb'
+include TestUtil::Assertions
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'file://server.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    opts.on("--k IORFILE",
+            "Set IOR.",
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+    opts.on("--d LVL",
+            "Set ORBDebugLevel value.",
+            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+    opts.on("--use-implement",
+            "Load IDL through CORBA.implement() instead of precompiled code.",
+            "Default: off") { |v| OPTIONS[:use_implement]=v }
+
+    opts.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba'
+  CORBA.implement('Test.idl', OPTIONS)
+else
+  require 'TestC.rb'
+end
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+begin
+    
+  obj = orb.string_to_object(OPTIONS[:iorfile])
+  
+  hello_obj = Test::Hello._narrow(obj)
+  
+  hello_strings = (1..10000).map {hello_obj.get_string}
+
+  puts "Client - got #{hello_strings.length} strings."
+
+  hello_obj.shutdown()
+  
+  assert_not "ERROR: Object is reported nil!", CORBA::is_nil(hello_obj)
+  
+  hello_obj._free_ref()
+  
+  assert "ERROR: Object is reported non-nil!", CORBA::is_nil(hello_obj)
+
+ensure
+    
+  orb.destroy()
+
+end

data/test/Multi_Threading/Threads/run_test.rb

@@ -1,76 +1,76 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# included with this program.
-#
-# Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
-#--------------------------------------------------------------------
-
-OPTIONS = {
-  :debug_opt => '',
-  :use_implement => '--use-implement'
-}
-
-require 'optparse'
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    opts.on("-d",
-            "Run with debugging output.",
-            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
-    opts.on("--use-stubs",
-            "Use stubs generated by RIDL.",
-            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
-
-    opts.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-require 'lib/test.rb'
-include TestUtil
-
-ior_file = 'server.ior'
-watchdog_ior_file = 'watchdog.ior'
-
-TestUtil.remove_file(ior_file)
-TestUtil.remove_file(watchdog_ior_file)
-
-wdog = Test.new
-srv = Test.new
-
-exit(255) if !wdog.run('watchdog.rb', "--o #{watchdog_ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-
-TestUtil.wait_for_file(watchdog_ior_file, 400)
-
-exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-
-TestUtil.wait_for_file(ior_file, 400)
-
-clt = Test.new
-
-if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
-  srv.kill(100)
-  exit(255)
-end
-
-exrc = clt.wait(400)
-
-if exrc ==0
-  srv.wait(400)
-else
-  srv.wait_term(400)
-end
-
-exit(exrc)
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the R2CORBA LICENSE which is
+# included with this program.
+#
+# Copyright (c) Remedy IT Expertise BV
+# Chamber of commerce Rotterdam nr.276339, The Netherlands
+#--------------------------------------------------------------------
+
+OPTIONS = {
+  :debug_opt => '',
+  :use_implement => '--use-implement'
+}
+
+require 'optparse'
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    opts.on("-d",
+            "Run with debugging output.",
+            "Default: false") { OPTIONS[:debug_opt] = '--d 10' }
+    opts.on("--use-stubs",
+            "Use stubs generated by RIDL.",
+            "Default: false (uses embedded IDL)") { OPTIONS[:use_implement] = '' }
+
+    opts.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+require 'lib/test.rb'
+include TestUtil
+
+ior_file = 'server.ior'
+watchdog_ior_file = 'watchdog.ior'
+
+TestUtil.remove_file(ior_file)
+TestUtil.remove_file(watchdog_ior_file)
+
+wdog = Test.new
+srv = Test.new
+
+exit(255) if !wdog.run('watchdog.rb', "--o #{watchdog_ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+
+TestUtil.wait_for_file(watchdog_ior_file, 400)
+
+exit(255) if !srv.run('server.rb', "--o #{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+
+TestUtil.wait_for_file(ior_file, 400)
+
+clt = Test.new
+
+if !clt.run('client.rb', "--k file://#{ior_file} #{OPTIONS[:debug_opt]} #{OPTIONS[:use_implement]}")
+  srv.kill(100)
+  exit(255)
+end
+
+exrc = clt.wait(400)
+
+if exrc ==0
+  srv.wait(400)
+else
+  srv.wait_term(400)
+end
+
+exit(exrc)

data/test/Multi_Threading/Threads/server.ior

@@ -1 +1 @@
-IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e372e3234380000bc051b00000014010f0052535475fe04529ef70a000000000001000000010000000002000000000000000800000001000000004f41540100000018000000010000000100010001000000010001050901010000000000
+IOR:010000001300000049444c3a546573742f48656c6c6f3a312e30000001000000000000006c000000010102000d0000003137322e31362e362e31373800000add1b00000014010f005253546cb2d354f0f802000000000001000000010000000002000000000000000800000001060000004f41540100000018000000010600000100010001000000010001050901010000000000

data/test/Multi_Threading/Threads/server.rb

@@ -1,119 +1,119 @@
-#--------------------------------------------------------------------
-#
-# Author: Martin Corino
-#
-# $Id: server.rb 279 2011-02-08 09:53:28Z martin $
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# included with this program.
-#
-# Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
-#--------------------------------------------------------------------
-
-require 'optparse'
-
-OPTIONS = {
-  :use_implement => false,
-  :orb_debuglevel => 0,
-  :iorfile => 'server.ior',
-  :watchdog_iorfile => 'file://watchdog.ior'
-}
-
-ARGV.options do |opts|
-    script_name = File.basename($0)
-    opts.banner = "Usage: ruby #{script_name} [options]"
-
-    opts.separator ""
-
-    opts.on("--o IORFILE",
-            "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
-    opts.on("--w IORFILE",
-            "Set Watchdog IOR filename.",
-            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_iorfile]=v }
-    opts.on("--d LVL",
-            "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
-    opts.on("--use-implement",
-            "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
-
-    opts.separator ""
-
-    opts.on("-h", "--help",
-            "Show this help message.") { puts opts; exit }
-
-    opts.parse!
-end
-
-if OPTIONS[:use_implement]
-  require 'corba/poa'
-  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
-else
-  require 'TestS.rb'
-end
-
-class MyHello < POA::Test::Hello
-  def initialize(orb, watchdog)
-    @orb = orb
-    @watchdog = watchdog
-    @count = 0
-    @stop = false
-    @wdt = Thread.new do
-      while !@stop
-        @watchdog.ping(self.object_id.to_s)
-        @count += 1
-        sleep 0.001
-      end
-    end
-  end
-
-  def get_string()
-    return 'Hello, world!'
-  end
-
-  def shutdown()
-    @stop = true
-    @watchdog.shutdown()
-    puts %Q{Server - pinged watchdog #{@count} times.}
-    @wdt.join
-    @orb.shutdown()
-  end
-end #of servant MyHello
-
-orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
-
-obj = orb.resolve_initial_references('RootPOA')
-
-root_poa = PortableServer::POA._narrow(obj)
-
-poa_man = root_poa.the_POAManager
-
-poa_man.activate
-
-obj = orb.string_to_object(OPTIONS[:watchdog_iorfile])
-
-watchdog_obj = Test::Watchdog._narrow(obj)
-
-hello_srv = MyHello.new(orb, watchdog_obj)
-
-hello_obj = hello_srv._this()
-
-hello_ior = orb.object_to_string(hello_obj)
-
-open(OPTIONS[:iorfile], 'w') { |io|
-  io.write hello_ior
-}
-
-Signal.trap('INT') do
-  puts "SIGINT - shutting down ORB..."
-  orb.shutdown()
-end
-
-if Signal.list.has_key?('USR2')
-  Signal.trap('USR2', 'EXIT')
-end
-
-orb.run
+#--------------------------------------------------------------------
+#
+# Author: Martin Corino
+#
+# $Id: server.rb 279 2011-02-08 09:53:28Z martin $
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the R2CORBA LICENSE which is
+# included with this program.
+#
+# Copyright (c) Remedy IT Expertise BV
+# Chamber of commerce Rotterdam nr.276339, The Netherlands
+#--------------------------------------------------------------------
+
+require 'optparse'
+
+OPTIONS = {
+  :use_implement => false,
+  :orb_debuglevel => 0,
+  :iorfile => 'server.ior',
+  :watchdog_iorfile => 'file://watchdog.ior'
+}
+
+ARGV.options do |opts|
+    script_name = File.basename($0)
+    opts.banner = "Usage: ruby #{script_name} [options]"
+
+    opts.separator ""
+
+    opts.on("--o IORFILE",
+            "Set IOR filename.",
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+    opts.on("--w IORFILE",
+            "Set Watchdog IOR filename.",
+            "Default: 'file://watchdog.ior'") { |v| OPTIONS[:watchdog_iorfile]=v }
+    opts.on("--d LVL",
+            "Set ORBDebugLevel value.",
+            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+    opts.on("--use-implement",
+            "Load IDL through CORBA.implement() instead of precompiled code.",
+            "Default: off") { |v| OPTIONS[:use_implement]=v }
+
+    opts.separator ""
+
+    opts.on("-h", "--help",
+            "Show this help message.") { puts opts; exit }
+
+    opts.parse!
+end
+
+if OPTIONS[:use_implement]
+  require 'corba/poa'
+  CORBA.implement('Test.idl', OPTIONS, CORBA::IDL::SERVANT_INTF)
+else
+  require 'TestS.rb'
+end
+
+class MyHello < POA::Test::Hello
+  def initialize(orb, watchdog)
+    @orb = orb
+    @watchdog = watchdog
+    @count = 0
+    @stop = false
+    @wdt = Thread.new do
+      while !@stop
+        @watchdog.ping(self.object_id.to_s)
+        @count += 1
+        sleep 0.001
+      end
+    end
+  end
+
+  def get_string()
+    return 'Hello, world!'
+  end
+
+  def shutdown()
+    @stop = true
+    @wdt.join
+    @watchdog.shutdown()
+    puts %Q{Server - pinged watchdog #{@count} times.}
+    @orb.shutdown()
+  end
+end #of servant MyHello
+
+orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB')
+
+obj = orb.resolve_initial_references('RootPOA')
+
+root_poa = PortableServer::POA._narrow(obj)
+
+poa_man = root_poa.the_POAManager
+
+poa_man.activate
+
+obj = orb.string_to_object(OPTIONS[:watchdog_iorfile])
+
+watchdog_obj = Test::Watchdog._narrow(obj)
+
+hello_srv = MyHello.new(orb, watchdog_obj)
+
+hello_obj = hello_srv._this()
+
+hello_ior = orb.object_to_string(hello_obj)
+
+open(OPTIONS[:iorfile], 'w') { |io|
+  io.write hello_ior
+}
+
+Signal.trap('INT') do
+  puts "SIGINT - shutting down ORB..."
+  orb.shutdown()
+end
+
+if Signal.list.has_key?('USR2')
+  Signal.trap('USR2', 'EXIT')
+end
+
+orb.run