DOC: fixed rdma documentation for PGPROEE10

Author: Liudmila Mantrova

doc/src/sgml/libpq.sgml

@@ -330,8 +330,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
        socket underlying the database connection.
        Loop thus: If <function>PQconnectPoll(conn)</function> last returned
        <symbol>PGRES_POLLING_READING</symbol>, wait until the socket is ready to
-       read (as indicated by <function>PQselect()</> or
-       <function>PQselectExtended()</>).
+       read (as indicated by <function>PQselect()</>).
        Then call <function>PQconnectPoll(conn)</function> again.
        Conversely, if <function>PQconnectPoll(conn)</function> last returned
        <symbol>PGRES_POLLING_WRITING</symbol>, wait until the socket is ready
@@ -1959,26 +1958,6 @@ int PQselect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, str
      </listitem>
     </varlistentry>
 
-    <varlistentry id="libpq-pqselectextended">
-     <term><function>PQselectExtended</function><indexterm><primary>PQselectExtended</></></term>
-     <listitem>
-      <para>
-       Uses select(2) or poll(2) to wait for input. The <literal>timeout</>
-       argument specifies the number of milliseconds that
-       <function>PQselectExtended</> should block waiting for a file descriptor
-       of the connection to become ready. Specifying a negative value
-       in <literal>timeout</> means an infinite timeout. Specifying a
-       <literal>timeout</> of zero causes <function>poll()</> to return
-       immediately.
-
-<synopsis>
-int PQselectExtended(const PGconn *conn, int timeout_ms);
-</synopsis>
-
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="libpq-pqbackendpid">
      <term><function>PQbackendPID</function><indexterm><primary>PQbackendPID</></></term>
      <listitem>
@@ -2044,6 +2023,21 @@ int PQconnectionUsedPassword(const PGconn *conn);
       </para>
      </listitem>
     </varlistentry>
+
+    <varlistentry id="libpq-pqisrsocket">
+     <term><function>PQisRsocket</function><indexterm><primary>PQisRsocket</></></term>
+     <listitem>
+      <para>
+       Returns true (1) if the connection uses <literal>rsocket</literal> API
+       and false (0) otherwise.
+
+<synopsis>
+int PQisRsocket(const PGconn *conn);
+</synopsis>
+
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
 
@@ -4634,7 +4628,7 @@ int PQisBusy(PGconn *conn);
 
   <para>
    A typical application using these functions will have a main loop that
-   uses <function>PQselect()</function> or <function>PQselectExtended()</> to wait for
+   uses <function>PQselect()</function> to wait for
    all the conditions that it must respond to.  One of the conditions
    will be input available from the server, which in terms of
    <function>PQselect()</function> means readable data on the file
@@ -5184,8 +5178,7 @@ typedef struct pgNotify
    useful commands to execute is to call
    <function>PQconsumeInput</function>, then check
    <function>PQnotifies</function>.  You can use
-   <function>PQselect()</function> or <function>PQselectExtended()</function>
-   to wait for data to arrive from the
+   <function>PQselect()</function> to wait for data to arrive from the
    server, thereby using no <acronym>CPU</acronym> power unless there is
    something to do.  (See <function>PQsocket</function> to obtain the file
    descriptor number to use with <function>PQselect()</function>.) Note that
@@ -8433,6 +8426,10 @@ main(int argc, char **argv)
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "libpq-fe.h"
 
 static void
@@ -8495,21 +8492,23 @@ main(int argc, char **argv)
     {
         /*
          * Sleep until something happens on the connection.  We use
-         * PQselectExtended to wait for input.
+         * PQselect to wait for input.
          */
         int         sock;
+        fd_set      input_mask;
 
         sock = PQsocket(conn);
 
         if (sock < 0)
-            break;              /* shouldn't happen */
+            break;                /* shouldn't happen */
 
         FD_ZERO(&input_mask);
         FD_SET(sock, &input_mask);
 
-        if (PQselectExtended(conn, -1) < 0)
+        if (PQselect(sock + 1, &input_mask, NULL, NULL, NULL,
+                     PQisRsocket(conn)) < 0)
         {
-            fprintf(stderr, "PQselectExtended() failed: %s\n", strerror(errno));
+            fprintf(stderr, "PQselect() failed: %s\n", strerror(errno));
             exit_nicely(conn);
         }
 

doc/src/sgml/ref/pg_basebackup.sgml

@@ -553,16 +553,6 @@ doc/src/sgml/ref/pg_basebackup.sgml
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--with-rsocket</option></term>
-      <listitem>
-       <para>
-        Connects to the server using <literal>rsocket</literal> API.
-        You must also set the <xref linkend="listen-rdma-addresses"> variable for your server to enable <acronym>RDMA</acronym> connections via <literal>rsocket</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
       <term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>

doc/src/sgml/ref/pgbench.sgml

@@ -732,16 +732,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>--with-rsocket</option></term>
-      <listitem>
-       <para>
-        Connect to the server using <literal>rsocket</literal> API.
-        You must also set the <xref linkend="listen-rdma-addresses"> variable for your server to enable <acronym>RDMA</acronym> connections via <literal>rsocket</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-U</option> <replaceable>login</></term>
       <term><option>--username=</option><replaceable>login</></term>