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

[Mike Link]

  User: mlink   
  Date: 07/11/09 15:57:47

  Modified:    drivers/udt_ref Makefile.am globus_xio_udt_ref.cpp
  Log:
  merge of netlogger driver branch
  reorg stack setting
  add disk stack setting
  rename udt_ref driver to udt
  
  Revision  Changes    Path
  1.3       +4 -4      xio/drivers/udt_ref/Makefile.am
  
  http://viewcvs.globus.org/viewcvs.cgi/xio/drivers/udt_ref/Makefile.am.diff?r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/xio/drivers/udt_ref/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Makefile.am	14 Mar 2006 06:58:18 -0000	1.2
  +++ Makefile.am	9 Nov 2007 21:57:46 -0000	1.3
  @@ -12,13 +12,13 @@
   
   INCLUDES = $(GPT_INCLUDES) -I $(UDT_PATH)/src
   
  -lib_LTLIBRARIES = libglobus_xio_udt_ref_driver_$(GLOBUS_FLAVOR_NAME).la
  +lib_LTLIBRARIES = libglobus_xio_udt_driver_$(GLOBUS_FLAVOR_NAME).la
   
  -libglobus_xio_udt_ref_driver___GLOBUS_FLAVOR_NAME__la_LIBADD = \
  +libglobus_xio_udt_driver___GLOBUS_FLAVOR_NAME__la_LIBADD = \
   	@GPT_LIB_LINKS@ $(UDT_PATH)/src/libudt.a 
  -libglobus_xio_udt_ref_driver___GLOBUS_FLAVOR_NAME__la_SOURCES = \
  +libglobus_xio_udt_driver___GLOBUS_FLAVOR_NAME__la_SOURCES = \
   	globus_xio_udt_ref.cpp
  -libglobus_xio_udt_ref_driver___GLOBUS_FLAVOR_NAME__la_LDFLAGS = \
  +libglobus_xio_udt_driver___GLOBUS_FLAVOR_NAME__la_LDFLAGS = \
   	@GPT_LDFLAGS@ -module -rpath $(GLOBUS_LOCATION)/lib
   
   EXTRA_DIST = version.h.in
  
  
  
  1.7       +13 -13    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.6&r2=1.7
  
  (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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- globus_xio_udt_ref.cpp	6 Nov 2007 05:48:15 -0000	1.6
  +++ globus_xio_udt_ref.cpp	9 Nov 2007 21:57:46 -0000	1.7
  @@ -31,11 +31,11 @@
           __LINE__,                                                           \
           _XIOSL(_reason))                                
   
  -GlobusDebugDefine(GLOBUS_XIO_UDT_REF);
  -GlobusXIODeclareDriver(udt_ref);
  +GlobusDebugDefine(GLOBUS_XIO_UDT);
  +GlobusXIODeclareDriver(udt);
   
   #define GlobusXIOUDTRefDebugPrintf(level, message)                           \
  -    GlobusDebugPrintf(GLOBUS_XIO_UDT_REF, level, message)
  +    GlobusDebugPrintf(GLOBUS_XIO_UDT, level, message)
   
   #define GlobusXIOUDTRefDebugEnter()                                          \
       GlobusXIOUDTRefDebugPrintf(                                              \
  @@ -104,9 +104,9 @@
       xio_l_udt_ref_attr_t *              attr,
       int                                 sock);
   
  -GlobusXIODefineModule(udt_ref) =
  +GlobusXIODefineModule(udt) =
   {
  -    "globus_xio_udt_ref",
  +    "globus_xio_udt",
       globus_l_xio_udt_ref_activate,
       globus_l_xio_udt_ref_deactivate,
       NULL,
  @@ -124,14 +124,14 @@
       int rc;
       GlobusXIOName(globus_l_xio_udt_ref_activate);
   
  -    GlobusDebugInit(GLOBUS_XIO_UDT_REF, TRACE);
  +    GlobusDebugInit(GLOBUS_XIO_UDT, TRACE);
       GlobusXIOUDTRefDebugEnter();
       rc = globus_module_activate(GLOBUS_XIO_MODULE);
       if (rc != GLOBUS_SUCCESS)
       {
           goto error_xio_system_activate;
       }
  -    GlobusXIORegisterDriver(udt_ref);
  +    GlobusXIORegisterDriver(udt);
       GlobusXIOUDTRefDebugExit();
   
       globus_l_xio_udt_ref_attr_default.fd = -1;
  @@ -153,7 +153,7 @@
   
   error_xio_system_activate:
       GlobusXIOUDTRefDebugExitWithError();
  -    GlobusDebugDestroy(GLOBUS_XIO_UDT_REF);
  +    GlobusDebugDestroy(GLOBUS_XIO_UDT);
       return rc;
   }
   
  @@ -166,19 +166,19 @@
       GlobusXIOName(globus_l_xio_udt_ref_deactivate);
       
       GlobusXIOUDTRefDebugEnter();
  -    GlobusXIOUnRegisterDriver(udt_ref);
  +    GlobusXIOUnRegisterDriver(udt);
       rc = globus_module_deactivate(GLOBUS_XIO_MODULE);
       if (rc != GLOBUS_SUCCESS)
       {   
           goto error_deactivate;
       }
       GlobusXIOUDTRefDebugExit();
  -    GlobusDebugDestroy(GLOBUS_XIO_UDT_REF);
  +    GlobusDebugDestroy(GLOBUS_XIO_UDT);
       return GLOBUS_SUCCESS;
   
   error_deactivate:
       GlobusXIOUDTRefDebugExitWithError();
  -    GlobusDebugDestroy(GLOBUS_XIO_UDT_REF);
  +    GlobusDebugDestroy(GLOBUS_XIO_UDT);
       return rc;
   }
   
  @@ -907,7 +907,7 @@
       GlobusXIOName(globus_l_xio_udt_ref_init);
   
       GlobusXIOUDTRefDebugEnter();
  -    result = globus_xio_driver_init(&driver, "udt_ref", NULL);
  +    result = globus_xio_driver_init(&driver, "udt", NULL);
       if(result != GLOBUS_SUCCESS)
       {
           result = GlobusXIOErrorWrapFailed(
  @@ -964,6 +964,6 @@
   
   
   GlobusXIODefineDriver(
  -    udt_ref,
  +    udt,
       globus_l_xio_udt_ref_init,
       globus_l_xio_udt_ref_destroy);