[Pkg-corba-commits] r63 - in /trunk/omniorb4: configure configure.ac debian/ debian/changelog debian/omniorb4.install debian/rules doc/omniNames.html doc/omniORB/omniORB002.html doc/tex/omniORB.tex include/omniconfig.h.in mk/beforeauto.mk.in sample.cfg src/tool/

flub-guest at users.alioth.debian.org flub-guest at users.alioth.debian.org
Mon Nov 26 00:49:35 UTC 2007


Author: flub-guest
Date: Mon Nov 26 00:49:35 2007
New Revision: 63

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=63
Log:
Upgrade to omniORB 4.1.1.

Removed:
    trunk/omniorb4/configure
    trunk/omniorb4/configure.ac
    trunk/omniorb4/doc/omniNames.html
    trunk/omniorb4/include/omniconfig.h.in
    trunk/omniorb4/src/tool/
Modified:
    trunk/omniorb4/debian/   (props changed)
    trunk/omniorb4/debian/changelog
    trunk/omniorb4/debian/omniorb4.install
    trunk/omniorb4/debian/rules
    trunk/omniorb4/doc/omniORB/omniORB002.html
    trunk/omniorb4/doc/tex/omniORB.tex
    trunk/omniorb4/mk/beforeauto.mk.in
    trunk/omniorb4/sample.cfg

Propchange: trunk/omniorb4/debian/
------------------------------------------------------------------------------
--- svn-bp:origUrl (original)
+++ svn-bp:origUrl Mon Nov 26 00:49:35 2007
@@ -1,1 +1,1 @@
-http://pkg-corba.alioth.debian.org/tarballs/omniorb4_4.1.0.orig.tar.gz
+http://pkg-corba.alioth.debian.org/tarballs/omniorb4_4.1.1.orig.tar.gz

Modified: trunk/omniorb4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/changelog?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/debian/changelog (original)
+++ trunk/omniorb4/debian/changelog Mon Nov 26 00:49:35 2007
@@ -1,8 +1,22 @@
-omniorb4 (4.1.0-2) UNRELEASED; urgency=low
-
+omniorb4 (4.1.1-1) UNRELEASED; urgency=low
+
+  [ Thomas Girard ]
   * Move omnicpp man page to section 1.
 
- -- Thomas Girard <thomas.g.girard at free.fr>  Sun, 18 Nov 2007 16:00:45 +0100
+  [ Floris Bruynooghe ]
+  * (NOT RELEASED YET) New upstream release.
+  * No longer modify configure.ac and configure, upstream caters for
+    kfreebsd now.  Thanks to Duncan Grisby for accepting the patch.
+  * No longer create omniNames.html, shipped by upstream now.
+  * No longer change include/omniconfig.h.in.
+  * mk/beforeauto.mk.in: Use upstream's MKDIRHIER and OMKDEPEND, there is no
+    rationale in the Debian changelog to change it and I prefer a minimal diff
+    with upstream.
+  * Bump shlibs version for libomniorb4-1 to 4.1.1 due to ABI change in the
+    internal header files (which are used by python-omniorb and omnievents).
+  * Add omkdepend binary (Closes #277627).
+
+ -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Mon, 26 Nov 2007 00:44:09 +0000
 
 omniorb4 (4.1.0-1) unstable; urgency=low
 

Modified: trunk/omniorb4/debian/omniorb4.install
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/omniorb4.install?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/debian/omniorb4.install (original)
+++ trunk/omniorb4/debian/omniorb4.install Mon Nov 26 00:49:35 2007
@@ -3,3 +3,4 @@
 usr/bin/genior
 usr/bin/nameclt
 usr/bin/omniMapper
+usr/bin/omkdepend

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Mon Nov 26 00:49:35 2007
@@ -99,7 +99,7 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -plibomnithread3c2 -V 'libomnithread3c2 (>= 4.0.6)'
-	dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.0)'
+	dh_makeshlibs -plibomniorb4-1 -V 'libomniorb4-1 (>= 4.1.1)'
 	dh_makeshlibs -plibcos4-1 -V 'libcos4-1 (>= 4.1.0)'
 	dh_pycentral -pomniidl4
 	dh_installdeb -a

Modified: trunk/omniorb4/doc/omniORB/omniORB002.html
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/doc/omniORB/omniORB002.html?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/doc/omniORB/omniORB002.html (original)
+++ trunk/omniorb4/doc/omniORB/omniORB002.html Mon Nov 26 00:49:35 2007
@@ -403,25 +403,26 @@
 Here is an example of how an <TT>Echo_ptr</TT> object reference is
 used.<BR>
 <BR>
-<DIV CLASS="lstlisting"><TT> 1  <B>void</B></TT><TT>
-</TT><TT> 2  hello(CORBA::Object_ptr obj)</TT><TT>
-</TT><TT> 3  {</TT><TT>
-</TT><TT> 4    Echo_var e = Echo::_narrow(obj);</TT><TT>
-</TT><TT> 5</TT><TT>
-</TT><TT> 6    <B>if</B> (CORBA::is_nil(e)) {</TT><TT>
-</TT><TT> 7      cerr &lt;&lt; "cannot invoke on a nil object reference."</TT><TT>
-</TT><TT> 8           &lt;&lt; endl;</TT><TT>
-</TT><TT> 9      <B>return</B>;</TT><TT>
-</TT><TT>10    }</TT><TT>
-</TT><TT>11</TT><TT>
-</TT><TT>12    CORBA::String_var src = (<B>const</B> <B>char</B>*) "Hello!";</TT><TT>
-</TT><TT>13    CORBA::String_var dest;</TT><TT>
-</TT><TT>14</TT><TT>
-</TT><TT>15    dest = e-&gt;echoString(src);</TT><TT>
-</TT><TT>16</TT><TT>
-</TT><TT>17    cerr &lt;&lt; "I said,\"" &lt;&lt; src &lt;&lt; "\"."</TT><TT>
-</TT><TT>18         &lt;&lt; " The Object said,\"" &lt;&lt; dest &lt;&lt;"\"" &lt;&lt; endl;</TT><TT>
-</TT><TT>19  }</TT></DIV><BR>
+
+<DIV CLASS="lstlisting"><TT><FONT SIZE=1>   1</FONT> </TT><TT><B>void</B></TT><TT>
+<FONT SIZE=1>   2</FONT> </TT><TT>hello(CORBA::Object_ptr obj)</TT><TT>
+<FONT SIZE=1>   3</FONT> </TT><TT>{</TT><TT>
+<FONT SIZE=1>   4</FONT> </TT><TT>  Echo_var e = Echo::_narrow(obj);</TT><TT>
+<FONT SIZE=1>   5</FONT> </TT><TT>
+<FONT SIZE=1>   6</FONT> </TT><TT>  <B>if</B> (CORBA::is_nil(e)) {</TT><TT>
+<FONT SIZE=1>   7</FONT> </TT><TT>    cerr &lt;&lt; "cannot invoke on a nil object reference."</TT><TT>
+<FONT SIZE=1>   8</FONT> </TT><TT>         &lt;&lt; endl;</TT><TT>
+<FONT SIZE=1>   9</FONT> </TT><TT>    <B>return</B>;</TT><TT>
+<FONT SIZE=1>  10</FONT> </TT><TT>  }</TT><TT>
+<FONT SIZE=1>  11</FONT> </TT><TT>
+<FONT SIZE=1>  12</FONT> </TT><TT>  CORBA::String_var src = (<B>const</B> <B>char</B>*) "Hello!";</TT><TT>
+<FONT SIZE=1>  13</FONT> </TT><TT>  CORBA::String_var dest;</TT><TT>
+<FONT SIZE=1>  14</FONT> </TT><TT>
+<FONT SIZE=1>  15</FONT> </TT><TT>  dest = e-&gt;echoString(src);</TT><TT>
+<FONT SIZE=1>  16</FONT> </TT><TT>
+<FONT SIZE=1>  17</FONT> </TT><TT>  cerr &lt;&lt; "I said,\"" &lt;&lt; src &lt;&lt; "\"."</TT><TT>
+<FONT SIZE=1>  18</FONT> </TT><TT>       &lt;&lt; " The Object said,\"" &lt;&lt; dest &lt;&lt;"\"" &lt;&lt; endl;</TT><TT>
+<FONT SIZE=1>  19</FONT> </TT><TT>}</TT></DIV><BR>
 <BR>
 Briefly, the <TT>hello()</TT> function accepts a generic object reference.
 The object reference (<TT>obj</TT>) is narrowed to <TT>Echo_ptr</TT>. If
@@ -474,28 +475,29 @@
 <BR>
 The code for this example is reproduced below:<BR>
 <BR>
-<DIV CLASS="lstlisting"><TT> 1  <B>int</B></TT><TT>
-</TT><TT> 2  main(<B>int</B> argc, <B>char</B> **argv)</TT><TT>
-</TT><TT> 3  {</TT><TT>
-</TT><TT> 4    CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv,"omniORB4");</TT><TT>
-</TT><TT> 5</TT><TT>
-</TT><TT> 6    CORBA::Object_var       obj = orb-&gt;resolve_initial_references("RootPOA");</TT><TT>
-</TT><TT> 7    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);</TT><TT>
-</TT><TT> 8</TT><TT>
-</TT><TT> 9    Echo_i *myecho = <B>new</B> Echo_i();</TT><TT>
-</TT><TT>10    PortableServer::ObjectId_var myechoid = poa-&gt;activate_object(myecho);</TT><TT>
-</TT><TT>11</TT><TT>
-</TT><TT>12    Echo_var myechoref = myecho-&gt;_this();</TT><TT>
-</TT><TT>13    myecho-&gt;_remove_ref();</TT><TT>
-</TT><TT>14</TT><TT>
-</TT><TT>15    PortableServer::POAManager_var pman = poa-&gt;the_POAManager();</TT><TT>
-</TT><TT>16    pman-&gt;activate();</TT><TT>
-</TT><TT>17</TT><TT>
-</TT><TT>18    hello(myechoref);</TT><TT>
-</TT><TT>19</TT><TT>
-</TT><TT>20    orb-&gt;destroy();</TT><TT>
-</TT><TT>21    <B>return</B> 0;</TT><TT>
-</TT><TT>22  }</TT></DIV><BR>
+
+<DIV CLASS="lstlisting"><TT><FONT SIZE=1>   1</FONT> </TT><TT><B>int</B></TT><TT>
+<FONT SIZE=1>   2</FONT> </TT><TT>main(<B>int</B> argc, <B>char</B> **argv)</TT><TT>
+<FONT SIZE=1>   3</FONT> </TT><TT>{</TT><TT>
+<FONT SIZE=1>   4</FONT> </TT><TT>  CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv,"omniORB4");</TT><TT>
+<FONT SIZE=1>   5</FONT> </TT><TT>
+<FONT SIZE=1>   6</FONT> </TT><TT>  CORBA::Object_var       obj = orb-&gt;resolve_initial_references("RootPOA");</TT><TT>
+<FONT SIZE=1>   7</FONT> </TT><TT>  PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);</TT><TT>
+<FONT SIZE=1>   8</FONT> </TT><TT>
+<FONT SIZE=1>   9</FONT> </TT><TT>  Echo_i *myecho = <B>new</B> Echo_i();</TT><TT>
+<FONT SIZE=1>  10</FONT> </TT><TT>  PortableServer::ObjectId_var myechoid = poa-&gt;activate_object(myecho);</TT><TT>
+<FONT SIZE=1>  11</FONT> </TT><TT>
+<FONT SIZE=1>  12</FONT> </TT><TT>  Echo_var myechoref = myecho-&gt;_this();</TT><TT>
+<FONT SIZE=1>  13</FONT> </TT><TT>  myecho-&gt;_remove_ref();</TT><TT>
+<FONT SIZE=1>  14</FONT> </TT><TT>
+<FONT SIZE=1>  15</FONT> </TT><TT>  PortableServer::POAManager_var pman = poa-&gt;the_POAManager();</TT><TT>
+<FONT SIZE=1>  16</FONT> </TT><TT>  pman-&gt;activate();</TT><TT>
+<FONT SIZE=1>  17</FONT> </TT><TT>
+<FONT SIZE=1>  18</FONT> </TT><TT>  hello(myechoref);</TT><TT>
+<FONT SIZE=1>  19</FONT> </TT><TT>
+<FONT SIZE=1>  20</FONT> </TT><TT>  orb-&gt;destroy();</TT><TT>
+<FONT SIZE=1>  21</FONT> </TT><TT>  <B>return</B> 0;</TT><TT>
+<FONT SIZE=1>  22</FONT> </TT><TT>}</TT></DIV><BR>
 <BR>
 The example illustrates several important interactions among the ORB,
 the POA, the servant, and the client. Here are the details:<BR>
@@ -622,30 +624,31 @@
 full listing (<TT>eg2_impl.cc</TT>) can be found at the end of this
 chapter.<BR>
 <BR>
-<DIV CLASS="lstlisting"><TT> 1  <B>int</B> main(<B>int</B> argc, <B>char</B>** argv)</TT><TT>
-</TT><TT> 2  {</TT><TT>
-</TT><TT> 3    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);</TT><TT>
-</TT><TT> 4</TT><TT>
-</TT><TT> 5    CORBA::Object_var       obj = orb-&gt;resolve_initial_references("RootPOA");</TT><TT>
-</TT><TT> 6    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);</TT><TT>
-</TT><TT> 7</TT><TT>
-</TT><TT> 8    Echo_i* myecho = <B>new</B> Echo_i();</TT><TT>
-</TT><TT> 9</TT><TT>
-</TT><TT>10    PortableServer::ObjectId_var myechoid = poa-&gt;activate_object(myecho);</TT><TT>
-</TT><TT>11</TT><TT>
-</TT><TT>12    obj = myecho-&gt;_this();</TT><TT>
-</TT><TT>13    CORBA::String_var sior(orb-&gt;object_to_string(obj));</TT><TT>
-</TT><TT>14    cerr &lt;&lt; "'" &lt;&lt; (<B>char</B>*)sior &lt;&lt; "'" &lt;&lt; endl;</TT><TT>
-</TT><TT>15</TT><TT>
-</TT><TT>16    myecho-&gt;_remove_ref();</TT><TT>
-</TT><TT>17</TT><TT>
-</TT><TT>18    PortableServer::POAManager_var pman = poa-&gt;the_POAManager();</TT><TT>
-</TT><TT>19    pman-&gt;activate();</TT><TT>
-</TT><TT>20</TT><TT>
-</TT><TT>21    orb-&gt;run();</TT><TT>
-</TT><TT>22    orb-&gt;destroy();</TT><TT>
-</TT><TT>23    <B>return</B> 0;</TT><TT>
-</TT><TT>24  }</TT></DIV><BR>
+
+<DIV CLASS="lstlisting"><TT><FONT SIZE=1>   1</FONT> </TT><TT><B>int</B> main(<B>int</B> argc, <B>char</B>** argv)</TT><TT>
+<FONT SIZE=1>   2</FONT> </TT><TT>{</TT><TT>
+<FONT SIZE=1>   3</FONT> </TT><TT>  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);</TT><TT>
+<FONT SIZE=1>   4</FONT> </TT><TT>
+<FONT SIZE=1>   5</FONT> </TT><TT>  CORBA::Object_var       obj = orb-&gt;resolve_initial_references("RootPOA");</TT><TT>
+<FONT SIZE=1>   6</FONT> </TT><TT>  PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);</TT><TT>
+<FONT SIZE=1>   7</FONT> </TT><TT>
+<FONT SIZE=1>   8</FONT> </TT><TT>  Echo_i* myecho = <B>new</B> Echo_i();</TT><TT>
+<FONT SIZE=1>   9</FONT> </TT><TT>
+<FONT SIZE=1>  10</FONT> </TT><TT>  PortableServer::ObjectId_var myechoid = poa-&gt;activate_object(myecho);</TT><TT>
+<FONT SIZE=1>  11</FONT> </TT><TT>
+<FONT SIZE=1>  12</FONT> </TT><TT>  obj = myecho-&gt;_this();</TT><TT>
+<FONT SIZE=1>  13</FONT> </TT><TT>  CORBA::String_var sior(orb-&gt;object_to_string(obj));</TT><TT>
+<FONT SIZE=1>  14</FONT> </TT><TT>  cerr &lt;&lt; (<B>char</B>*)sior &lt;&lt; endl;</TT><TT>
+<FONT SIZE=1>  15</FONT> </TT><TT>
+<FONT SIZE=1>  16</FONT> </TT><TT>  myecho-&gt;_remove_ref();</TT><TT>
+<FONT SIZE=1>  17</FONT> </TT><TT>
+<FONT SIZE=1>  18</FONT> </TT><TT>  PortableServer::POAManager_var pman = poa-&gt;the_POAManager();</TT><TT>
+<FONT SIZE=1>  19</FONT> </TT><TT>  pman-&gt;activate();</TT><TT>
+<FONT SIZE=1>  20</FONT> </TT><TT>
+<FONT SIZE=1>  21</FONT> </TT><TT>  orb-&gt;run();</TT><TT>
+<FONT SIZE=1>  22</FONT> </TT><TT>  orb-&gt;destroy();</TT><TT>
+<FONT SIZE=1>  23</FONT> </TT><TT>  <B>return</B> 0;</TT><TT>
+<FONT SIZE=1>  24</FONT> </TT><TT>}</TT></DIV><BR>
 <BR>
 The stringified object reference is obtained by calling the ORB's
 <TT>object_to_string()</TT> function (line 13). This results in a

Modified: trunk/omniorb4/doc/tex/omniORB.tex
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/doc/tex/omniORB.tex?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/doc/tex/omniORB.tex (original)
+++ trunk/omniorb4/doc/tex/omniORB.tex Mon Nov 26 00:49:35 2007
@@ -123,6 +123,7 @@
 \lstset{basicstyle=\ttfamily\small,
         keywordstyle=,
         commentstyle=\itshape,
+	stepnumber=1,
         numberstyle=\tiny,
         showstringspaces=false,
         abovecaptionskip=0pt,
@@ -193,12 +194,19 @@
 
 \vfill
 \vfill
-April 2006
+July 2007
 \vfill
 
 \end{center}
 
 \clearpage
+
+{\Large \bf Changes and Additions, July 2007}
+\begin{itemize}
+\item Updates for omniORB 4.1.1.
+\end{itemize}
+
+\vspace{\baselineskip}
 
 {\Large \bf Changes and Additions, June 2005}
 \begin{itemize}
@@ -914,9 +922,7 @@
 Here is an example of how an \type{Echo\_ptr} object reference is
 used.
 
-%BEGIN LATEX
-\lstset{stepnumber=1,gobble=4}
-%END LATEX
+\lstset{numbers=left,gobble=4}
 \begin{cxxlisting}
  1  void
  2  hello(CORBA::Object_ptr obj)
@@ -938,7 +944,7 @@
 18         << " The Object said,\"" << dest <<"\"" << endl;
 19  }
 \end{cxxlisting}
-\lstset{stepnumber=0,gobble=0}
+\lstset{numbers=none,gobble=0}
 
 Briefly, the \op{hello} function accepts a generic object reference.
 The object reference (\code{obj}) is narrowed to \type{Echo\_ptr}. If
@@ -994,10 +1000,7 @@
 
 The code for this example is reproduced below:
 
-
-%BEGIN LATEX
-\lstset{stepnumber=1,gobble=4}
-%END LATEX
+\lstset{numbers=left,gobble=4}
 \begin{cxxlisting}
  1  int
  2  main(int argc, char **argv)
@@ -1022,7 +1025,7 @@
 21    return 0;
 22  }
 \end{cxxlisting}
-\lstset{stepnumber=0,gobble=0}
+\lstset{numbers=none,gobble=0}
 
 The example illustrates several important interactions among the ORB,
 the POA, the servant, and the client. Here are the details:
@@ -1196,9 +1199,7 @@
 full listing (\file{eg2_impl.cc}) can be found at the end of this
 chapter.
 
-%BEGIN LATEX
-\lstset{stepnumber=1,gobble=4}
-%END LATEX
+\lstset{numbers=left,gobble=4}
 \begin{cxxlisting}
  1  int main(int argc, char** argv)
  2  {
@@ -1213,7 +1214,7 @@
 11
 12    obj = myecho->_this();
 13    CORBA::String_var sior(orb->object_to_string(obj));
-14    cerr << "'" << (char*)sior << "'" << endl;
+14    cerr << (char*)sior << endl;
 15
 16    myecho->_remove_ref();
 17
@@ -1225,7 +1226,7 @@
 23    return 0;
 24  }
 \end{cxxlisting}
-\lstset{stepnumber=0,gobble=0}
+\lstset{numbers=none,gobble=0}
 
 The stringified object reference is obtained by calling the ORB's
 \op{object\_to\_\dsc{}string} function (line 13). This results in a
@@ -2390,8 +2391,8 @@
 
 \section{omniORB 4.0 compatibility}
 
-omniORB 4.1 is source-code compatible with omniORB 4.0, with three
-minor exceptions:
+omniORB 4.1 is source-code compatible with omniORB 4.0, with four
+exceptions:
 
 \begin{enumerate}
 
@@ -2412,6 +2413,26 @@
   been changed, replacing all the separate variables with a single
   member of type \code{GIOP\_C}. All the values previously available
   can be accessed through the \code{GIOP\_C} instance.
+
+\item The C++ mapping contains Any insertion operators for sequence
+  types passed by pointer, which cause the Any to take ownership of
+  the inserted sequence. In omniORB 4.0 and earlier, the sequence was
+  immediately marshalled into the Any's internal buffer, and the
+  sequence was deleted. In omniORB 4.1, the sequence pointer is stored
+  by the Any, and the sequence is deleted later when the Any is
+  destroyed.
+
+  For most uses, this change is not visible to application code.
+  However, if a sequence is constructed using an application-supplied
+  buffer with the release flag set to false (meaning that the
+  application continues to own the buffer), it is now important that
+  the buffer is not deleted or modified while the Any exists, since
+  the Any continues to refer to the buffer contents.  This change
+  means that code that worked with omniORB 4.0 may now fail with 4.1,
+  with the Any seeing modified data or the process crashing due to
+  accessing deleted data. To avoid this situation, use the alternative
+  Any insertion operator using a const reference, which copies the
+  sequence.
 
 \end{enumerate}
 
@@ -4123,9 +4144,7 @@
 };
 \end{idllisting}
 
-%BEGIN LATEX
-\lstset{stepnumber=1,gobble=4}
-%END LATEX
+\lstset{numbers=left,gobble=4}
 \begin{cxxlisting}
  1  // C++
  2  C_ptr objC;
@@ -4138,7 +4157,7 @@
  9  objR =  objC->op2();
 10  objA =  A::_narrow(objR);
 \end{cxxlisting}
-\lstset{stepnumber=0,gobble=0}
+\lstset{numbers=none,gobble=0}
 
 \noindent If the stubs of A,B,C,D are linked into the executable and:
 
@@ -4336,6 +4355,14 @@
 This kind of configuration is good when connections are slow to be
 established.
 
+If an object reference has multiple possible endpoints available, and
+connecting to the first endpoint times out, only that one endpoint
+will have been tried before an exception is raised. However, once the
+timeout has occurred, the object reference will switch to use the next
+endpoint. If the application attempts to make another call, it will
+use the next endpoint.
+
+
 \subsubsection*{Connect timeout < usual timeout}
 
 If the connect timeout is set to 2 seconds, the actual network-level
@@ -4354,7 +4381,10 @@
 The connect timeout applies to each connection attempt. So with a
 connect timeout of 2 seconds, the client will spend up to 2 seconds
 attempting to connect to the first address and then, if that fails, up
-to 2 seconds trying the second address, and so on.
+to 2 seconds trying the second address, and so on. The 10 second
+timeout still applies to the call as a whole, so if the total time
+taken on timed-out connection attempts exceeds 10 seconds, the call
+will time out.
 
 This kind of configuration is useful where calls may take a long time
 to complete (so call timeouts are long), but a fast indication of
@@ -4583,12 +4613,13 @@
 On platforms where it is available, omniORB supports IPv6. On most
 Unix platforms, IPv6 sockets accept both IPv6 and IPv4 connections, so
 omniORB's default \code{giop:tcp::} endpoint accepts both IPv4 and
-IPv6 connections. On Windows, each socket type only accepts incoming
-connections of the same type, so an IPv6 socket cannot be used with
-IPv4 clients. For this reason, the default \code{giop:tcp::} endpoint
-only listens for IPv4 connections. Since endpoints with a specific
-host name or address only listen on a single network interface, they
-are inherently limited to just one protocol family.
+IPv6 connections. On Windows versions before Windows Vista, each
+socket type only accepts incoming connections of the same type, so an
+IPv6 socket cannot be used with IPv4 clients. For this reason, the
+default \code{giop:tcp::} endpoint only listens for IPv4 connections.
+Since endpoints with a specific host name or address only listen on a
+single network interface, they are inherently limited to just one
+protocol family.
 
 To explicitly ask for just IPv4 or just IPv6, an endpoint with the
 wildcard address for the protocol family should be used. For IPv4, the
@@ -4609,8 +4640,8 @@
 \code{giop:tcp:[::]:}
 \end{quote}
 
-\noindent To listen for both IPv4 and IPv6 connections on Windows,
-both endpoints must be explicitly provided.
+\noindent To listen for both IPv4 and IPv6 connections on Windows
+versions prior to Vista, both endpoints must be explicitly provided.
 
 \subsubsection{Link local addresses}
 

Modified: trunk/omniorb4/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/mk/beforeauto.mk.in?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/mk/beforeauto.mk.in (original)
+++ trunk/omniorb4/mk/beforeauto.mk.in Mon Nov 26 00:49:35 2007
@@ -500,6 +500,17 @@
 OMNITHREAD_LIB = $(patsubst %,$(LibSearchPattern),omnithread)
 
 
+# CodeSets library
+OMNIORB_CODESETS_LIB = $(patsubst %,$(LibSearchPattern),omniCodeSets$(OMNIORB_MAJOR_VERSION))
+lib_depend := $(patsubst %,$(LibPattern),omniCodeSets$(OMNIORB_MAJOR_VERSION))
+OMNIORB_CODESETS_LIB_DEPEND := $(GENERATE_LIB_DEPEND)
+
+# Connections library
+OMNIORB_CONNECTIONS_LIB = $(patsubst %,$(LibSearchPattern),omniConnectionMgmt$(OMNIORB_MAJOR_VERSION))
+lib_depend := $(patsubst %,$(LibPattern),omniConnectionMgmt$(OMNIORB_MAJOR_VERSION))
+OMNIORB_CONNECTIONS_LIB_DEPEND := $(GENERATE_LIB_DEPEND)
+
+
 
 # omniORB SSL transport
 OMNIORB_SSL_VERSION = $(OMNIORB_VERSION)
@@ -664,16 +675,17 @@
 CC              = @CC@
 CXX             = @CXX@
 RANLIB		= @RANLIB@
-MKDIRHIER	= mkdir -p
+MKDIRHIER	= $(BASE_OMNI_TREE)/bin/scripts/omkdirhier
 INSTLIBFLAGS	= -m 0644
 INSTEXEFLAGS	= -m 0755
 CP		= cp
 MV		= mv -f
 CPP		= @CPP@
+OMKDEPEND	= $(TOOLBINDIR)/omkdepend
 RMDIRHIER	= $(RM) -rf
 
-CXXMAKEDEPEND   = @CXX@ -M -MD -MG
-CMAKEDEPEND     = @CC@ -M -MD -MG
+CXXMAKEDEPEND   = $(OMKDEPEND) -D__cplusplus
+CMAKEDEPEND     = $(OMKDEPEND)
 
 
 #
@@ -725,6 +737,8 @@
 #
 
 ifdef Compiler_GCC
+CMAKEDEPEND     += -D__GNUC__
+CXXMAKEDEPEND   += -D__GNUG__ -D__GNUC__
 CXXOPTIONS       = -Wall -Wno-unused -fexceptions @EXTRA_GCC_CXXFLAGS@
 EgcsMajorVersion = 1
 EgcsMinorVersion = 1
@@ -1110,6 +1124,10 @@
 IMPORT_CPPFLAGS += -D__x86__
 endif
 
+ifdef x8664Processor
+IMPORT_CPPFLAGS += -D__x86_64__
+endif
+
 ifdef SparcProcessor
 IMPORT_CPPFLAGS += -D__sparc__
 endif

Modified: trunk/omniorb4/sample.cfg
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/sample.cfg?rev=63&op=diff
==============================================================================
--- trunk/omniorb4/sample.cfg (original)
+++ trunk/omniorb4/sample.cfg Mon Nov 26 00:49:35 2007
@@ -246,12 +246,30 @@
 #   The default values are platform specific. It is unlikely that you
 #   will need to change the values from the defaults.
 #
-#   The minimum valid limit is 8KB, 8192 bytes.
+#   The minimum valid limit is 1KB, 1024 bytes.
 #
 #   e.g. to limit to 64KB sends / receives:
 #
 #     maxSocketSend = 65536
 #     maxSocketRecv = 65536
+
+############################################################################
+# socketSendBuffer
+#
+#   On Windows, there is a kernel buffer used during send operations.
+#   A bug in Windows means that if a send uses the entire kernel
+#   buffer, a select() on the socket blocks until all the data has
+#   been acknowledged by the receiver, resulting in dreadful
+#   performance. This parameter modifies the socket send buffer from
+#   its default (8192 bytes on Windows) to the value specified. If
+#   this parameter is set to -1, the socket send buffer is left at the
+#   system default.
+#
+#   On Windows, the default value of this parameter is 16384 bytes; on
+#   all other platforms the default is -1.
+#
+#     socketSendBuffer = -1
+
 
 ############################################################################
 # sslCAFile
@@ -445,6 +463,18 @@
 supportPerThreadTimeOut = 0
 
 ############################################################################
+# resetTimeoutOnRetries
+#
+#    If true, the call timeout is reset when an exception handler
+#    causes a call to be retried. If false, the timeout is not reset,
+#    and therefore applies to the call as a whole, rather than to each
+#    individual call attempt.
+#
+#    Valid values = 0 or 1
+#
+resetTimeOutOnRetries = 0
+
+############################################################################
 # outConScanPeriod
 #
 #   Idle connections shutdown. The ORB periodically scans all the




More information about the Pkg-corba-commits mailing list