[xio-commit] CVS update: MODIFIED: udt_ref ...

[Mike Link]

  User: mlink   
  Date: 07/11/05 23:48:15

  Modified:    drivers/udt_ref configure.in globus_xio_udt_ref.cpp
  Log:
  fix for udt 4.0, make build udt release automatically if available
  
  Revision  Changes    Path
  1.3       +21 -6     xio/drivers/udt_ref/configure.in
  
  http://viewcvs.globus.org/viewcvs.cgi/xio/drivers/udt_ref/configure.in.diff?r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: configure.in
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/xio/drivers/udt_ref/configure.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- configure.in	14 Mar 2006 06:58:18 -0000	1.2
  +++ configure.in	6 Nov 2007 05:48:15 -0000	1.3
  @@ -1,6 +1,6 @@
   dnl
   
  -AC_REVISION($Revision: 1.2 $)
  +AC_REVISION($Revision: 1.3 $)
   AC_INIT(Makefile.am)
   
   GLOBUS_INIT
  @@ -14,15 +14,30 @@
   
   LAC_DOXYGEN("../", "", "$GLOBUS_LOCATION/sbin/globus-vararg-enums-doxygen-filter.pl")
   
  -AC_SUBST( UDT_PATH)
  -
  -
  +AC_MSG_CHECKING(for UDT)
   AC_ARG_WITH( udt-path,
  -[  --with-udt-path=DIR    location of srb ],
  -    CONFIG_UDT_PATH="${withval}", AC_MSG_ERROR( [must specify udt path: --with-udt-path] ))
  +[  --with-udt-path=DIR    location of udt ],
  +    CONFIG_UDT_PATH="${withval}", )
  +
  +if test "X${CONFIG_UDT_PATH}" = "X"; then
  +  if test -f udt.sdk*.tar.gz; then
  +    tar xfz udt.sdk*.tar.gz
  +    cd udt4
  +    make >build.log 2>&1
  +    cd ..
  +    CONFIG_UDT_PATH="udt4"	
  +    AC_MSG_RESULT(UDT package found and built)
  +  else
  +    AC_MSG_ERROR(UDT package not found and udt-path not set)
  +  fi
  +else
  +  AC_MSG_RESULT(${CONFIG_UDT_PATH})
  +fi
   
   UDT_PATH=${CONFIG_UDT_PATH}
   
  +AC_SUBST(UDT_PATH)
  +
   GLOBUS_FINALIZE
   
   AC_OUTPUT(
  
  
  
  1.6       +10 -5     xio/drivers/udt_ref/globus_xio_udt_ref.cpp
  
  http://viewcvs.globus.org/viewcvs.cgi/xio/drivers/udt_ref/globus_xio_udt_ref.cpp.diff?r1=1.5&r2=1.6
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: globus_xio_udt_ref.cpp
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/xio/drivers/udt_ref/globus_xio_udt_ref.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- globus_xio_udt_ref.cpp	22 Oct 2007 17:20:29 -0000	1.5
  +++ globus_xio_udt_ref.cpp	6 Nov 2007 05:48:15 -0000	1.6
  @@ -147,7 +147,7 @@
       globus_l_xio_udt_ref_attr_default.sndtimeo = -1;
       globus_l_xio_udt_ref_attr_default.rcvtimeo = -1;
       globus_l_xio_udt_ref_attr_default.reuseaddr = XIO_UDT_BOOL_UNDEF;
  -    globus_l_xio_udt_ref_attr_default.port = -1;
  +    globus_l_xio_udt_ref_attr_default.port = 0;
   
       return GLOBUS_SUCCESS;
   
  @@ -322,7 +322,10 @@
       void *                              driver_attr)
   {
       /* this is fine for now (no pointers in it) */
  +    if(driver_attr)
  +    {
       globus_free(driver_attr);
  +    }
   
       return GLOBUS_SUCCESS;
   }
  @@ -414,7 +417,8 @@
       xio_l_udt_ref_attr_t *              attr;
       GlobusXIOName(globus_l_xio_udt_ref_server_init);
   
  -    attr = (xio_l_udt_ref_attr_t *) driver_attr;
  +    attr = (xio_l_udt_ref_attr_t *) 
  +        (driver_attr ? driver_attr : &globus_l_xio_udt_ref_attr_default);
   
       server_handle = (xio_l_udt_ref_server_handle_t *)
           globus_calloc(1, sizeof(xio_l_udt_ref_server_handle_t));
  @@ -719,7 +723,8 @@
       xio_l_udt_ref_handle_t *            handle;
       GlobusXIOName(globus_l_xio_udt_ref_open);
   
  -    attr = (xio_l_udt_ref_attr_t *) driver_attr;
  +    attr = (xio_l_udt_ref_attr_t *) 
  +        (driver_attr ? driver_attr : &globus_l_xio_udt_ref_attr_default);
   
       if(driver_link == NULL)
       {
  @@ -786,7 +791,7 @@
           }
           else
           {
  -            UDT::setFD(handle->sock, attr->fd);
  +            /* UDT::setFD(handle->sock, attr->fd); */
           }
           if(UDT::connect(
               handle->sock, addrinfo->ai_addr, addrinfo->ai_addrlen))