[openib-general] [PATCH] OpenSM: Use memory routines directly and eliminate cl_mem* routines
Hal Rosenstock
halr at voltaire.com
Wed May 17 09:14:09 PDT 2006
OpenSM: Use memory routines directly and eliminate cl_mem* routines
as these routines are part of ISO C
Signed-off-by: Hal Rosenstock <halr at voltaire.com>
Index: osm/include/opensm/osm_port.h
===================================================================
--- osm/include/opensm/osm_port.h (revision 7286)
+++ osm/include/opensm/osm_port.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -1296,7 +1296,7 @@ static inline void
osm_port_construct(
IN osm_port_t* const p_port )
{
- cl_memclr( p_port, sizeof(*p_port) );
+ memset( p_port, 0, sizeof(*p_port) );
cl_qlist_init( &p_port->mcm_list );
}
/*
Index: osm/include/opensm/osm_madw.h
===================================================================
--- osm/include/opensm/osm_madw.h (revision 7286)
+++ osm/include/opensm/osm_madw.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -489,8 +489,8 @@ osm_madw_construct(
Don't touch the pool_item since that is an opaque object.
Clear all other objects in the mad wrapper.
*/
- cl_memclr( ((uint8_t *)p_madw) + sizeof( cl_pool_item_t ),
- sizeof(*p_madw) - sizeof( cl_pool_item_t ) );
+ memset( ((uint8_t *)p_madw) + sizeof( cl_pool_item_t ), 0,
+ sizeof(*p_madw) - sizeof( cl_pool_item_t ) );
}
/*
* PARAMETERS
Index: osm/include/opensm/osm_mcm_info.h
===================================================================
--- osm/include/opensm/osm_mcm_info.h (revision 7286)
+++ osm/include/opensm/osm_mcm_info.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -108,7 +108,7 @@ static inline void
osm_mcm_info_construct(
IN osm_mcm_info_t* const p_mcm )
{
- cl_memclr( p_mcm, sizeof(*p_mcm) );
+ memset( p_mcm, 0, sizeof(*p_mcm) );
}
/*
* PARAMETERS
Index: osm/include/opensm/osm_path.h
===================================================================
--- osm/include/opensm/osm_path.h (revision 7286)
+++ osm/include/opensm/osm_path.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -121,7 +121,7 @@ osm_dr_path_construct(
IN osm_dr_path_t* const p_path )
{
/* The first location in the path array is reserved. */
- cl_memclr( p_path, sizeof(*p_path) );
+ memset( p_path, 0, sizeof(*p_path) );
p_path->h_bind = OSM_BIND_INVALID_HANDLE;
}
@@ -168,7 +168,7 @@ osm_dr_path_init(
CL_ASSERT( hop_count < IB_SUBNET_PATH_HOPS_MAX );
p_path->h_bind = h_bind;
p_path->hop_count = hop_count;
- cl_memcpy( p_path->path, path, IB_SUBNET_PATH_HOPS_MAX );
+ memcpy( p_path->path, path, IB_SUBNET_PATH_HOPS_MAX );
}
/*
Index: osm/include/opensm/osm_port_profile.h
===================================================================
--- osm/include/opensm/osm_port_profile.h (revision 7286)
+++ osm/include/opensm/osm_port_profile.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -125,7 +125,7 @@ osm_port_prof_construct(
IN osm_port_profile_t* const p_prof )
{
CL_ASSERT( p_prof );
- cl_memclr( p_prof, sizeof(*p_prof) );
+ memset( p_prof, 0, sizeof(*p_prof) );
}
/*
* PARAMETERS
Index: osm/include/opensm/osm_mtree.h
===================================================================
--- osm/include/opensm/osm_mtree.h (revision 7286)
+++ osm/include/opensm/osm_mtree.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -154,7 +154,7 @@ static inline void
osm_mtree_node_construct(
IN osm_mtree_node_t* const p_mtn )
{
- cl_memclr( p_mtn, sizeof(*p_mtn) );
+ memset( p_mtn, 0, sizeof(*p_mtn) );
}
/*
* PARAMETERS
Index: osm/include/opensm/osm_lin_fwd_tbl.h
===================================================================
--- osm/include/opensm/osm_lin_fwd_tbl.h (revision 7286)
+++ osm/include/opensm/osm_lin_fwd_tbl.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -351,7 +351,7 @@ osm_lin_fwd_tbl_set_block(
if( lid_start + num_lids > p_tbl->size )
return( IB_INVALID_PARAMETER );
- cl_memcpy( &p_tbl->port_tbl[lid_start], p_block, num_lids );
+ memcpy( &p_tbl->port_tbl[lid_start], p_block, num_lids );
return( IB_SUCCESS );
}
/*
Index: osm/include/complib/cl_memory.h
===================================================================
--- osm/include/complib/cl_memory.h (revision 7286)
+++ osm/include/complib/cl_memory.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -437,7 +437,7 @@ cl_malloc(
* environments.
*
* SEE ALSO
-* Memory Management, cl_free, cl_zalloc, cl_memset, cl_memclr, cl_memcpy, cl_memcmp
+* Memory Management, cl_free, cl_zalloc
**********/
@@ -468,7 +468,7 @@ cl_zalloc(
* environments.
*
* SEE ALSO
-* Memory Management, cl_free, cl_malloc, cl_memset, cl_memclr, cl_memcpy, cl_memcmp
+* Memory Management, cl_free, cl_malloc
**********/
@@ -503,142 +503,6 @@ cl_free(
**********/
-/****f* Public: Memory Management/cl_memset
-* NAME
-* cl_memset
-*
-* DESCRIPTION
-* The cl_memset function sets every byte in a memory range to a given value.
-*
-* SYNOPSIS
-*/
-void
-cl_memset(
- IN void* const p_memory,
- IN const uint8_t fill,
- IN const size_t count );
-/*
-* PARAMETERS
-* p_memory
-* [in] Pointer to a memory block.
-*
-* fill
-* [in] Byte value with which to fill the memory.
-*
-* count
-* [in] Number of bytes to set.
-*
-* RETURN VALUE
-* This function does not return a value.
-*
-* SEE ALSO
-* Memory Management, cl_memclr, cl_memcpy, cl_memcmp
-**********/
-
-
-/****f* Public: Memory Management/cl_memclr
-* NAME
-* cl_memclr
-*
-* DESCRIPTION
-* The cl_memclr function sets every byte in a memory range to zero.
-*
-* SYNOPSIS
-*/
-static inline void
-cl_memclr(
- IN void* const p_memory,
- IN const size_t count )
-{
- cl_memset( p_memory, 0, count );
-}
-/*
-* PARAMETERS
-* p_memory
-* [in] Pointer to a memory block.
-*
-* count
-* [in] Number of bytes to set.
-*
-* RETURN VALUE
-* This function does not return a value.
-*
-* SEE ALSO
-* Memory Management, cl_memset, cl_memcpy, cl_memcmp
-**********/
-
-
-/****f* Public: Memory Management/cl_memcpy
-* NAME
-* cl_memcpy
-*
-* DESCRIPTION
-* The cl_memcpy function copies a given number of bytes from
-* one buffer to another.
-*
-* SYNOPSIS
-*/
-void*
-cl_memcpy(
- IN void* const p_dest,
- IN const void* const p_src,
- IN const size_t count );
-/*
-* PARAMETERS
-* p_dest
-* [in] Pointer to the buffer being copied to.
-*
-* p_src
-* [in] Pointer to the buffer being copied from.
-*
-* count
-* [in] Number of bytes to copy from the source buffer to the
-* destination buffer.
-*
-* RETURN VALUE
-* This function does not return a value.
-*
-* SEE ALSO
-* Memory Management, cl_memset, cl_memclr, cl_memcmp
-**********/
-
-
-/****f* Public: Memory Management/cl_memcmp
-* NAME
-* cl_memcmp
-*
-* DESCRIPTION
-* The cl_memcmp function compares two memory buffers.
-*
-* SYNOPSIS
-*/
-int32_t
-cl_memcmp(
- IN const void* const p_mem,
- IN const void* const p_ref,
- IN const size_t count );
-/*
-* PARAMETERS
-* p_mem
-* [in] Pointer to a memory block being compared.
-*
-* p_ref
-* [in] Pointer to the reference memory block to compare against.
-*
-* count
-* [in] Number of bytes to compare.
-*
-* RETURN VALUES
-* Returns less than zero if p_mem is less than p_ref.
-*
-* Returns greater than zero if p_mem is greater than p_ref.
-*
-* Returns zero if the two memory regions are the identical.
-*
-* SEE ALSO
-* Memory Management, cl_memset, cl_memclr, cl_memcpy
-**********/
-
/****f* Public: Memory Management/cl_get_pagesize
* NAME
* cl_get_pagesize
Index: osm/include/complib/cl_byteswap.h
===================================================================
--- osm/include/complib/cl_byteswap.h (revision 7286)
+++ osm/include/complib/cl_byteswap.h (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -528,7 +528,7 @@ cl_ntoh(
* the destination.
*/
if( p_src != p_dest )
- cl_memcpy( p_dest, p_src, size );
+ memcpy( p_dest, p_src, size );
#endif
}
/*
Index: osm/include/iba/ib_types.h
===================================================================
--- osm/include/iba/ib_types.h (revision 7286)
+++ osm/include/iba/ib_types.h (working copy)
@@ -3659,15 +3659,15 @@ ib_smp_init_new(
p_smp->dr_slid = dr_slid;
p_smp->dr_dlid = dr_dlid;
- cl_memclr( p_smp->resv1,
- sizeof(p_smp->resv1) +
- sizeof(p_smp->data) +
- sizeof(p_smp->initial_path) +
- sizeof(p_smp->return_path) );
+ memset( p_smp->resv1, 0,
+ sizeof(p_smp->resv1) +
+ sizeof(p_smp->data) +
+ sizeof(p_smp->initial_path) +
+ sizeof(p_smp->return_path) );
/* copy the path */
- cl_memcpy( &p_smp->initial_path, path_out,
- sizeof( p_smp->initial_path ) );
+ memcpy( &p_smp->initial_path, path_out,
+ sizeof( p_smp->initial_path ) );
}
/*
* PARAMETERS
Index: osm/include/vendor/osm_vendor_mlx_svc.h
===================================================================
--- osm/include/vendor/osm_vendor_mlx_svc.h (revision 7286)
+++ osm/include/vendor/osm_vendor_mlx_svc.h (working copy)
@@ -192,8 +192,7 @@ osmv_mad_copy(IN const ib_mad_t *p_mad)
p_copy = cl_zalloc(MAD_BLOCK_SIZE);
if (NULL != p_copy) {
-
- cl_memcpy(p_copy, p_mad, MAD_BLOCK_SIZE);
+ memcpy(p_copy, p_mad, MAD_BLOCK_SIZE);
}
return p_copy;
Index: osm/libvendor/osm_vendor_mlx_dispatcher.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_dispatcher.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_dispatcher.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -268,7 +268,7 @@ __osmv_dispatch_simple_mad(IN osm_bind_h
p_mad_buf = osm_madw_get_mad_ptr(p_madw);
/* Copy the payload to the MAD buffer */
- cl_memcpy((void*)p_mad_buf, (void*)p_mad, MAD_BLOCK_SIZE);
+ memcpy((void*)p_mad_buf, (void*)p_mad, MAD_BLOCK_SIZE);
if (NULL != p_txn)
{
Index: osm/libvendor/osm_vendor_mlx_ts.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_ts.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_ts.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -292,7 +292,7 @@ osmv_transport_mad_send(IN const osm_bin
OSM_LOG_ENTER( p_vend->p_log, osmv_transport_mad_send);
- cl_memclr(&ts_mad,sizeof(ts_mad));
+ memset(&ts_mad, 0, sizeof(ts_mad));
/* Make sure the p_bo object is still relevant */
if (( p_bo->magic_ptr != p_bo) || p_bo->is_closing )
@@ -301,7 +301,7 @@ osmv_transport_mad_send(IN const osm_bin
/*
* Copy the MAD over to the sent mad
*/
- cl_memcpy(&ts_mad, p_mad_hdr, MAD_BLOCK_SIZE);
+ memcpy(&ts_mad, p_mad_hdr, MAD_BLOCK_SIZE);
/*
* For all sends other than directed route SM MADs,
@@ -376,7 +376,7 @@ __osm_transport_gen_dummy_mad(osmv_bind_
int ts_ioctl_ret;
/* prepare the mad fields following the stored filter on the bind */
- cl_memclr(&ts_mad, sizeof(ts_mad));
+ memset(&ts_mad, 0, sizeof(ts_mad));
ts_mad.format_version = 1;
ts_mad.mgmt_class = p_mgr->filter.mgmt_class;
ts_mad.attribute_id = 0x2;
@@ -482,9 +482,9 @@ __osmv_TOPSPIN_mad_addr_to_osm_addr(
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_mad_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
&p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
*/
@@ -512,7 +512,7 @@ osm_vendor_set_sm(
OSM_LOG_ENTER( p_vend->p_log, osm_vendor_set_sm );
- cl_memclr(&set_port_data, sizeof(set_port_data));
+ memset(&set_port_data, 0, sizeof(set_port_data));
set_port_data.port = p_bo->port_num;
set_port_data.port_info.valid_fields = IB_PORT_IS_SM;
Index: osm/libvendor/osm_pkt_randomizer.c
===================================================================
--- osm/libvendor/osm_pkt_randomizer.c (revision 7286)
+++ osm/libvendor/osm_pkt_randomizer.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -196,8 +196,8 @@ __osm_pkt_randomizer_process_path(
buf, rand_value, p_pkt_rand->osm_pkt_unstable_link_rate );
/* update the path in the fault paths */
- cl_memcpy( &(p_pkt_rand->fault_dr_paths[p_pkt_rand->num_paths_initialized]),
- p_dr_path, sizeof(osm_dr_path_t) );
+ memcpy( &(p_pkt_rand->fault_dr_paths[p_pkt_rand->num_paths_initialized]),
+ p_dr_path, sizeof(osm_dr_path_t) );
p_pkt_rand->num_paths_initialized++;
in_fault_paths = TRUE;
}
@@ -288,7 +288,7 @@ osm_pkt_randomizer_init(
res = IB_INSUFFICIENT_MEMORY;
goto Exit;
}
- cl_memclr( *pp_pkt_randomizer, sizeof(osm_pkt_randomizer_t) );
+ memset( *pp_pkt_randomizer, 0, sizeof(osm_pkt_randomizer_t) );
(*pp_pkt_randomizer)->num_paths_initialized = 0;
tmp = atol( getenv("OSM_PKT_DROP_RATE") );
Index: osm/libvendor/osm_vendor_mlx_hca.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_hca.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_hca.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -71,7 +71,7 @@ ib_api_status_t
__osm_vendor_gid_to_guid( IN u_int8_t * gid,
OUT VAPI_gid_t * guid )
{
- cl_memcpy( guid, gid + 8, 8 );
+ memcpy( guid, gid + 8, 8 );
return ( IB_SUCCESS );
}
Index: osm/libvendor/osm_vendor_mlx_sa.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_sa.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_sa.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -536,7 +536,7 @@ __osmv_send_sa_req(
cl_atomic_inc( &trans_id );
/* Cleanup the MAD from any residue */
- cl_memclr(p_sa_mad, MAD_BLOCK_SIZE);
+ memset(p_sa_mad, 0, MAD_BLOCK_SIZE);
/* Initialize the standard MAD header. */
ib_mad_init_new(
@@ -555,8 +555,8 @@ __osmv_send_sa_req(
p_sa_mad->comp_mask = p_sa_mad_data->comp_mask;
if( p_sa_mad->comp_mask )
{
- cl_memcpy( p_sa_mad->data, p_sa_mad_data->p_attr,
- ib_get_attr_size(p_sa_mad_data->attr_offset));
+ memcpy( p_sa_mad->data, p_sa_mad_data->p_attr,
+ ib_get_attr_size(p_sa_mad_data->attr_offset));
}
/*
@@ -674,8 +674,8 @@ osmv_query_sa(
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_service_record_t ) );
sa_mad_data.p_attr = &svc_rec;
- cl_memcpy( svc_rec.service_name, p_query_req->p_query_input,
- sizeof( ib_svc_name_t ) );
+ memcpy( svc_rec.service_name, p_query_req->p_query_input,
+ sizeof( ib_svc_name_t ) );
break;
case OSMV_QUERY_SVC_REC_BY_ID:
@@ -765,7 +765,7 @@ osmv_query_sa(
case OSMV_QUERY_PATH_REC_BY_PORT_GUIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_PORT_GUIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_path_rec_t ) );
@@ -784,24 +784,24 @@ osmv_query_sa(
case OSMV_QUERY_PATH_REC_BY_GIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_GIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_path_rec_t ) );
sa_mad_data.comp_mask = ( IB_PR_COMPMASK_DGID | IB_PR_COMPMASK_SGID );
sa_mad_data.p_attr = &path_rec;
- cl_memcpy( &path_rec.dgid,
- &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
- dest_gid, sizeof( ib_gid_t ) );
- cl_memcpy( &path_rec.sgid,
- &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
- src_gid, sizeof( ib_gid_t ) );
+ memcpy( &path_rec.dgid,
+ &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
+ dest_gid, sizeof( ib_gid_t ) );
+ memcpy( &path_rec.sgid,
+ &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
+ src_gid, sizeof( ib_gid_t ) );
break;
case OSMV_QUERY_PATH_REC_BY_LIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_LIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.method = IB_MAD_METHOD_GET;
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
Index: osm/libvendor/osm_vendor_ibumad_sa.c
===================================================================
--- osm/libvendor/osm_vendor_ibumad_sa.c (revision 7286)
+++ osm/libvendor/osm_vendor_ibumad_sa.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -528,7 +528,7 @@ __osmv_send_sa_req(
cl_atomic_inc( &trans_id );
/* Cleanup the MAD from any residue */
- cl_memclr(p_sa_mad, MAD_BLOCK_SIZE);
+ memset(p_sa_mad, 0, MAD_BLOCK_SIZE);
/* Initialize the standard MAD header. */
ib_mad_init_new(
@@ -551,8 +551,8 @@ __osmv_send_sa_req(
#endif
if( p_sa_mad->comp_mask )
{
- cl_memcpy( p_sa_mad->data, p_sa_mad_data->p_attr,
- ib_get_attr_size(p_sa_mad_data->attr_offset));
+ memcpy( p_sa_mad->data, p_sa_mad_data->p_attr,
+ ib_get_attr_size(p_sa_mad_data->attr_offset));
}
/*
@@ -670,8 +670,8 @@ osmv_query_sa(
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_service_record_t ) );
sa_mad_data.p_attr = &svc_rec;
- cl_memcpy( svc_rec.service_name, p_query_req->p_query_input,
- sizeof( ib_svc_name_t ) );
+ memcpy( svc_rec.service_name, p_query_req->p_query_input,
+ sizeof( ib_svc_name_t ) );
break;
case OSMV_QUERY_SVC_REC_BY_ID:
@@ -759,7 +759,7 @@ osmv_query_sa(
case OSMV_QUERY_PATH_REC_BY_PORT_GUIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_PORT_GUIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_path_rec_t ) );
@@ -778,24 +778,24 @@ osmv_query_sa(
case OSMV_QUERY_PATH_REC_BY_GIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_GIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
ib_get_attr_offset( sizeof( ib_path_rec_t ) );
sa_mad_data.comp_mask = ( IB_PR_COMPMASK_DGID | IB_PR_COMPMASK_SGID );
sa_mad_data.p_attr = &path_rec;
- cl_memcpy( &path_rec.dgid,
- &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
- dest_gid, sizeof( ib_gid_t ) );
- cl_memcpy( &path_rec.sgid,
- &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
- src_gid, sizeof( ib_gid_t ) );
+ memcpy( &path_rec.dgid,
+ &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
+ dest_gid, sizeof( ib_gid_t ) );
+ memcpy( &path_rec.sgid,
+ &( ( osmv_gid_pair_t * ) ( p_query_req->p_query_input ) )->
+ src_gid, sizeof( ib_gid_t ) );
break;
case OSMV_QUERY_PATH_REC_BY_LIDS:
osm_log( p_log, OSM_LOG_DEBUG,
"osmv_query_sa DBG:001 %s","PATH_REC_BY_LIDS\n" );
- cl_memclr(&path_rec, sizeof(ib_path_rec_t ));
+ memset(&path_rec, 0, sizeof(ib_path_rec_t ));
sa_mad_data.method = IB_MAD_METHOD_GET;
sa_mad_data.attr_id = IB_MAD_ATTR_PATH_RECORD;
sa_mad_data.attr_offset =
@@ -848,7 +848,7 @@ osmv_query_sa(
CL_ASSERT( 0 );
return IB_ERROR;
}
- cl_memclr(&multipath_rec, sizeof(ib_multipath_rec_t ));
+ memset(&multipath_rec, 0, sizeof(ib_multipath_rec_t ));
sa_mad_data.method = IB_MAD_METHOD_GETMULTI;
sa_mad_data.attr_id = IB_MAD_ATTR_MULTIPATH_RECORD;
sa_mad_data.attr_offset =
Index: osm/libvendor/osm_vendor_mlx_sender.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_sender.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_sender.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,8 +77,8 @@ osmv_simple_send_madw(IN osm_bind_handle
CL_ASSERT( p_madw->mad_size <= MAD_BLOCK_SIZE );
- cl_memclr(p_mad, MAD_BLOCK_SIZE);
- cl_memcpy(p_mad, osm_madw_get_mad_ptr(p_madw), p_madw->mad_size);
+ memset(p_mad, 0, MAD_BLOCK_SIZE);
+ memcpy(p_mad, osm_madw_get_mad_ptr(p_madw), p_madw->mad_size);
if (NULL != p_txn)
{
@@ -275,7 +275,7 @@ osmv_rmpp_send_ack(IN osm_bind_handle_t
}
#endif
- cl_memcpy(p_resp_mad, p_req_mad, MAD_BLOCK_SIZE);
+ memcpy(p_resp_mad, p_req_mad, MAD_BLOCK_SIZE);
p_resp_mad->common_hdr.method = osmv_invert_method(p_req_mad->method);
p_resp_mad->rmpp_type = IB_RMPP_TYPE_ACK;
@@ -302,7 +302,7 @@ osmv_rmpp_send_nak(IN osm_bind_handle_t
uint8_t resp_mad[MAD_BLOCK_SIZE];
ib_rmpp_mad_t *p_resp_mad = (ib_rmpp_mad_t*)resp_mad;
- cl_memcpy(p_resp_mad, p_req_mad, MAD_BLOCK_SIZE);
+ memcpy(p_resp_mad, p_req_mad, MAD_BLOCK_SIZE);
p_resp_mad->common_hdr.method = osmv_invert_method(p_req_mad->method);
p_resp_mad->rmpp_type = nak_type;
Index: osm/libvendor/osm_vendor_mlx_sar.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_sar.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_sar.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -95,10 +95,10 @@ osmv_rmpp_sar_get_mad_seg(
}
/* cleanup */
- cl_memclr(p_buf, MAD_BLOCK_SIZE);
+ memset(p_buf, 0, MAD_BLOCK_SIZE);
/* attach header */
- cl_memcpy(p_buf,p_sar->p_arbt_mad,p_sar->hdr_sz);
+ memcpy(p_buf,p_sar->p_arbt_mad,p_sar->hdr_sz);
/* fill data */
@@ -106,10 +106,10 @@ osmv_rmpp_sar_get_mad_seg(
sz_left = p_sar->data_len - ((seg_idx -1) * p_sar->data_sz);
if (sz_left > p_sar->data_sz)
{
- cl_memcpy((char*)p_buf+p_sar->hdr_sz,(char*)p_seg,p_sar->data_sz);
+ memcpy((char*)p_buf+p_sar->hdr_sz,(char*)p_seg,p_sar->data_sz);
}
else
- cl_memcpy((char*)p_buf+ p_sar->hdr_sz, (char*)p_seg, sz_left);
+ memcpy((char*)p_buf+ p_sar->hdr_sz, (char*)p_seg, sz_left);
return IB_SUCCESS;
@@ -135,7 +135,7 @@ osmv_rmpp_sar_reassemble_arbt_mad(osmv_r
p_item = cl_qlist_head(p_bufs);
p_obj = PARENT_STRUCT(p_item, cl_list_obj_t, list_item);
buf_tmp = cl_qlist_obj(p_obj);
- cl_memcpy(p_mad,buf_tmp,p_sar->hdr_sz);
+ memcpy(p_mad,buf_tmp,p_sar->hdr_sz);
p_mad = (char*)p_mad + p_sar->hdr_sz;
space_left-= p_sar->hdr_sz;
@@ -148,14 +148,14 @@ osmv_rmpp_sar_reassemble_arbt_mad(osmv_r
if (FALSE == cl_is_qlist_empty(p_bufs))
{
- cl_memcpy((char*)p_mad,(char*)buf_tmp+p_sar->hdr_sz,p_sar->data_sz);
+ memcpy((char*)p_mad,(char*)buf_tmp+p_sar->hdr_sz,p_sar->data_sz);
p_mad = (char*)p_mad + p_sar->data_sz;
space_left-= p_sar->data_sz;
}
else
{
/* the last mad on the list */
- cl_memcpy((char*)p_mad,(char*)buf_tmp+p_sar->hdr_sz,space_left);
+ memcpy((char*)p_mad,(char*)buf_tmp+p_sar->hdr_sz,space_left);
p_mad= (char*)p_mad+space_left;
}
Index: osm/libvendor/osm_vendor_mlx_sim.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_sim.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_sim.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -257,7 +257,7 @@ osmv_transport_mad_send(IN const osm_bin
OSM_LOG_ENTER( p_vend->p_log, osmv_transport_mad_send);
- cl_memclr(&mad_msg,sizeof(mad_msg));
+ memset(&mad_msg, 0, sizeof(mad_msg));
/* Make sure the p_bo object is still relevant */
if (( p_bo->magic_ptr != p_bo) || p_bo->is_closing )
@@ -266,7 +266,7 @@ osmv_transport_mad_send(IN const osm_bin
/*
* Copy the MAD over to the sent mad
*/
- cl_memcpy(&mad_msg.header, p_mad_hdr, MAD_BLOCK_SIZE);
+ memcpy(&mad_msg.header, p_mad_hdr, MAD_BLOCK_SIZE);
/*
* For all sends other than directed route SM MADs,
@@ -411,9 +411,9 @@ __osmv_ibms_mad_addr_to_osm_addr(
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_osm_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_osm_addr->addr_type.gsi.grh_info.src_gid.raw,
+ memcpy(&p_osm_addr->addr_type.gsi.grh_info.src_gid.raw,
&p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_osm_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ memcpy(&p_osm_addr->addr_type.gsi.grh_info.dest_gid.raw,
p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
*/
Index: osm/libvendor/osm_vendor_umadt.c
===================================================================
--- osm/libvendor/osm_vendor_umadt.c (revision 7286)
+++ osm/libvendor/osm_vendor_umadt.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -325,7 +325,7 @@ osm_vendor_get_ports(
/* query each ca & copy its info into callers buffer */
for ( caCount = 0; caCount < caGuidCount; caCount++ )
{
- cl_memclr ( &caAttributes,sizeof ( IB_CA_ATTRIBUTES ) );
+ memset ( &caAttributes, 0, sizeof ( IB_CA_ATTRIBUTES ) );
/* Open the CA */
Status = p_umadt_obj->IbtInterface.Vpi.OpenCA ( CaGuidArray[caCount], NULL, /* CACompletionCallback */
@@ -348,7 +348,7 @@ osm_vendor_get_ports(
if ( caAttributes.Ports > free_guids)
{
*p_num_guids = 0;
- cl_memclr (p_guids, (*p_num_guids)*sizeof(uint64_t));
+ memset (p_guids, 0, (*p_num_guids)*sizeof(uint64_t));
return IB_INSUFFICIENT_MEMORY;
}
@@ -360,12 +360,12 @@ osm_vendor_get_ports(
{
p_umadt_obj->IbtInterface.Vpi.CloseCA ( caHandle );
*p_num_guids = 0;
- cl_memclr (p_guids, (*p_num_guids)*sizeof(uint64_t));
+ memset (p_guids, 0, (*p_num_guids)*sizeof(uint64_t));
return IB_INSUFFICIENT_MEMORY;
}
- cl_memclr ( pPortAttributesList,
- caAttributes.PortAttributesListSize );
+ memset ( pPortAttributesList, 0,
+ caAttributes.PortAttributesListSize );
caAttributes.PortAttributesList = pPortAttributesList;
@@ -376,7 +376,7 @@ osm_vendor_get_ports(
{
p_umadt_obj->IbtInterface.Vpi.CloseCA ( caHandle );
*p_num_guids = 0;
- cl_memclr (p_guids, (*p_num_guids)*sizeof(uint64_t));
+ memset (p_guids, 0, (*p_num_guids)*sizeof(uint64_t));
return IB_ERROR;
}
@@ -616,7 +616,7 @@ osm_vendor_send(
}
/* No Segmentation required */
- cl_memcpy(&p_madt_struct->IBMad, p_mad, MAD_BLOCK_SIZE);
+ memcpy(&p_madt_struct->IBMad, p_mad, MAD_BLOCK_SIZE);
/* Post the MAD */
@@ -668,7 +668,7 @@ osm_vendor_send(
if ( i == 0) /* First Packet */
{
/* Since this is the first MAD, copy the entire MAD_SIZE */
- cl_memcpy(&p_madt_struct->IBMad, p_mad, MAD_BLOCK_SIZE);
+ memcpy(&p_madt_struct->IBMad, p_mad, MAD_BLOCK_SIZE);
p_frag_data = (uint8_t*)p_mad + MAD_BLOCK_SIZE;
@@ -691,21 +691,21 @@ osm_vendor_send(
else if ( i < num_mads -1) /* Not last packet */
{
/* First copy only the header */
- cl_memcpy(&p_madt_struct->IBMad, p_mad, IB_SA_MAD_HDR_SIZE);
+ memcpy(&p_madt_struct->IBMad, p_mad, IB_SA_MAD_HDR_SIZE);
/* Set the relevant fields in the SA_MAD_HEADER */
p_sa_mad = (ib_sa_mad_t_vM3*)&p_madt_struct->IBMad;
p_sa_mad->payload_len = cl_ntoh32(IB_SA_DATA_SIZE);
p_sa_mad->seg_num = cl_ntoh32(seg_num++);
p_sa_mad->frag_flag = 0;
/* Now copy the fragmented data */
- cl_memcpy(((uint8_t*)&p_madt_struct->IBMad) + IB_SA_MAD_HDR_SIZE, p_frag_data, IB_SA_DATA_SIZE);
+ memcpy(((uint8_t*)&p_madt_struct->IBMad) + IB_SA_MAD_HDR_SIZE, p_frag_data, IB_SA_DATA_SIZE);
p_frag_data = p_frag_data + IB_SA_DATA_SIZE;
}
else if ( i == num_mads - 1) /* Last packet */
{
/* First copy only the header */
- cl_memcpy(&p_madt_struct->IBMad, p_mad, IB_SA_MAD_HDR_SIZE);
+ memcpy(&p_madt_struct->IBMad, p_mad, IB_SA_MAD_HDR_SIZE);
/* Set the relevant fields in the SA_MAD_HEADER */
p_sa_mad = (ib_sa_mad_t_vM3*)&p_madt_struct->IBMad;
p_sa_mad->seg_num = cl_ntoh32(seg_num++);
@@ -713,7 +713,7 @@ osm_vendor_send(
p_sa_mad->payload_len =
cl_ntoh32(cl_ntoh32(((ib_sa_mad_t_vM3*)p_mad)->payload_len) % IB_SA_DATA_SIZE);
/* Now copy the fragmented data */
- cl_memcpy((((uint8_t*)&p_madt_struct->IBMad)) + IB_SA_MAD_HDR_SIZE,
+ memcpy((((uint8_t*)&p_madt_struct->IBMad)) + IB_SA_MAD_HDR_SIZE,
p_frag_data, cl_ntoh32(p_sa_mad->payload_len));
p_frag_data = p_frag_data + IB_SA_DATA_SIZE;
Index: osm/libvendor/osm_vendor_mlx_rmpp_ctx.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_rmpp_ctx.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_rmpp_ctx.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -264,7 +264,7 @@ osmv_rmpp_recv_ctx_store_mad_seg(IN osmv
{
return IB_INSUFFICIENT_MEMORY;
}
- cl_memcpy(p_list_mad,p_mad,MAD_BLOCK_SIZE);
+ memcpy(p_list_mad,p_mad,MAD_BLOCK_SIZE);
p_obj = cl_zalloc(sizeof(cl_list_obj_t));
if (NULL == p_obj)
Index: osm/libvendor/osm_vendor_test.c
===================================================================
--- osm/libvendor/osm_vendor_test.c (revision 7286)
+++ osm/libvendor/osm_vendor_test.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -67,7 +67,7 @@ void
osm_vendor_construct(
IN osm_vendor_t* const p_vend )
{
- cl_memclr( p_vend, sizeof(*p_vend) );
+ memset( p_vend, 0, sizeof(*p_vend) );
}
/**********************************************************************
Index: osm/libvendor/osm_vendor_mlx_ibmgt.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_ibmgt.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_ibmgt.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -387,7 +387,7 @@ osmv_transport_mad_send(IN const osm_bin
else
{
/* is a directed route - we need to construct a permissive address */
- cl_memclr( &av, sizeof( av ) );
+ memset( &av, 0, sizeof( av ) );
/* we do not need port number since it is part of the mad_hndl */
av.dlid = IB_LID_PERMISSIVE;
}
@@ -711,7 +711,7 @@ __osmv_IBMGT_rcv_desc_to_osm_addr(
p_mad_addr->static_rate = 0; /* HACK - we do not know the rate ! */
p_mad_addr->path_bits = p_rcv_desc->local_path_bits;
/* Clear the grh any way to avoid unset fields */
- cl_memclr(&p_mad_addr->addr_type.gsi.grh_info, sizeof(p_mad_addr->addr_type.gsi.grh_info));
+ memset(&p_mad_addr->addr_type.gsi.grh_info, 0, sizeof(p_mad_addr->addr_type.gsi.grh_info));
if (is_smi)
{
@@ -746,10 +746,10 @@ __osmv_IBMGT_rcv_desc_to_osm_addr(
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_mad_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
- &p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
- p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
+ &p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
}
}
@@ -766,7 +766,7 @@ __osmv_IBMGT_osm_addr_to_ibmgt_addr(
/* For global destination or Multicast address:*/
u_int8_t ver;
- cl_memclr( p_av, sizeof( IB_ud_av_t ) );
+ memset( p_av, 0, sizeof( IB_ud_av_t ) );
p_av->src_path_bits = p_mad_addr->path_bits;
p_av->static_rate = p_mad_addr->static_rate;
@@ -789,10 +789,9 @@ __osmv_IBMGT_osm_addr_to_ibmgt_addr(
&p_av->flow_label);
p_av->hop_limit = p_mad_addr->addr_type.gsi.grh_info.hop_limit;
p_av->sgid_index = 0; /* we always use source GID 0 */
- cl_memcpy(&p_av->dgid,
- &p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
- sizeof(ib_net64_t));
-
+ memcpy(&p_av->dgid,
+ &p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ sizeof(ib_net64_t));
}
}
Index: osm/libvendor/osm_vendor_ts.c
===================================================================
--- osm/libvendor/osm_vendor_ts.c (revision 7286)
+++ osm/libvendor/osm_vendor_ts.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -60,7 +60,7 @@ __osm_set_wrid_by_p_madw(IN osm_madw_t *
CL_ASSERT(p_madw->p_mad);
- cl_memcpy( &wrid, &p_madw, sizeof( osm_madw_t * ) );
+ memcpy( &wrid, &p_madw, sizeof( osm_madw_t * ) );
wrid = (wrid << 1) |
ib_mad_is_response(p_madw->p_mad) |
(p_madw->p_mad->method == IB_MAD_METHOD_TRAP_REPRESS);
@@ -74,7 +74,7 @@ __osm_set_p_madw_and_resp_by_wrid(
OUT osm_madw_t **pp_madw) {
*is_resp = wrid & 0x0000000000000001;
wrid = wrid >> 1;
- cl_memcpy( pp_madw, &wrid, sizeof( osm_madw_t * ) );
+ memcpy( pp_madw, &wrid, sizeof( osm_madw_t * ) );
}
/**********************************************************************
@@ -120,9 +120,9 @@ __osm_ts_conv_mad_rcv_desc_to_osm_addr(
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_mad_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
&p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
*/
@@ -167,8 +167,8 @@ __osm_vendor_clear_sm( IN osm_bind_handl
OSM_LOG_ENTER( p_vend->p_log, __osm_vendor_clear_sm );
- cl_memclr( &attr_mod, sizeof( attr_mod ) );
- cl_memclr( &attr_mask, sizeof( attr_mask ) );
+ memset( &attr_mod, 0, sizeof( attr_mod ) );
+ memset( &attr_mask, 0, sizeof( attr_mask ) );
attr_mod.is_sm = FALSE;
attr_mask = HCA_ATTR_IS_SM;
@@ -193,7 +193,7 @@ __osm_vendor_clear_sm( IN osm_bind_handl
void
osm_vendor_construct( IN osm_vendor_t * const p_vend )
{
- cl_memclr( p_vend, sizeof( *p_vend ) );
+ memset( p_vend, 0, sizeof( *p_vend ) );
cl_thread_construct( &(p_vend->smi_bind.poller) );
cl_thread_construct( &(p_vend->gsi_bind.poller) );
}
@@ -386,7 +386,7 @@ __osm_ts_rcv_callback(
p_new_vw->p_resp_madw = NULL;
p_new_vw->p_mad_buf = p_mad_buf;
- cl_memcpy( p_new_vw->p_mad_buf, p_mad, mad_size );
+ memcpy( p_new_vw->p_mad_buf, p_mad, mad_size );
/* attach the buffer to the wrapper */
p_madw->p_mad = p_mad_buf;
@@ -724,7 +724,7 @@ osm_vendor_get( IN osm_bind_handle_t h_b
goto Exit;
}
- cl_memclr( p_mad, p_vw->size );
+ memset( p_mad, 0, p_vw->size );
/* track locally */
p_vw->p_mad_buf = p_mad;
@@ -804,7 +804,7 @@ osm_ts_send_mad(
/*
* Copy the MAD over to the sent mad
*/
- cl_memcpy(&ts_mad, p_mad, 256);
+ memcpy(&ts_mad, p_mad, 256);
/*
* For all sends other than directed route SM MADs,
@@ -958,8 +958,8 @@ osm_vendor_set_sm(
OSM_LOG_ENTER( p_vend->p_log, osm_vendor_set_sm );
- cl_memclr( &attr_mod, sizeof( attr_mod ) );
- cl_memclr( &attr_mask, sizeof( attr_mask ) );
+ memset( &attr_mod, 0, sizeof( attr_mod ) );
+ memset( &attr_mask, 0, sizeof( attr_mask ) );
attr_mod.is_sm = is_sm_val;
attr_mask = HCA_ATTR_IS_SM;
Index: osm/libvendor/osm_vendor_mtl.c
===================================================================
--- osm/libvendor/osm_vendor_mtl.c (revision 7286)
+++ osm/libvendor/osm_vendor_mtl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -67,7 +67,7 @@ __osm_set_wrid_by_p_madw(IN osm_madw_t *
CL_ASSERT(p_madw->p_mad);
- cl_memcpy( &wrid, &p_madw, sizeof( osm_madw_t * ) );
+ memcpy( &wrid, &p_madw, sizeof( osm_madw_t * ) );
wrid = (wrid << 1) |
ib_mad_is_response(p_madw->p_mad) |
(p_madw->p_mad->method == IB_MAD_METHOD_TRAP_REPRESS);
@@ -81,7 +81,7 @@ __osm_set_p_madw_and_resp_by_wrid(
OUT osm_madw_t **pp_madw) {
*is_resp = wrid & 0x0000000000000001;
wrid = wrid >> 1;
- cl_memcpy( pp_madw, &wrid, sizeof( osm_madw_t * ) );
+ memcpy( pp_madw, &wrid, sizeof( osm_madw_t * ) );
}
/**********************************************************************
@@ -111,7 +111,6 @@ __osm_mtl_conv_ibmgt_rcv_desc_to_osm_add
/* Does IBMGT supposed to provide the QPN is network or HOST ? */
p_mad_addr->addr_type.gsi.remote_qp = cl_hton32(p_rcv_desc->qp);
-
p_mad_addr->addr_type.gsi.remote_qkey = IB_QP1_WELL_KNOWN_Q_KEY;
/* we do have the p_mad_addr->pkey_ix but how to get the PKey by index ? */
/* the only way seems to be to use VAPI_query_hca_pkey_tbl and obtain */
@@ -131,10 +130,10 @@ __osm_mtl_conv_ibmgt_rcv_desc_to_osm_add
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_mad_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
- &p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
- p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
+ &p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
}
}
@@ -152,7 +151,7 @@ __osm_mtl_conv_osm_addr_to_ibmgt_addr(
/* For global destination or Multicast address:*/
u_int8_t ver;
- cl_memclr( p_av, sizeof( IB_ud_av_t ) );
+ memset( p_av, 0, sizeof( IB_ud_av_t ) );
p_av->src_path_bits = p_mad_addr->path_bits;
p_av->static_rate = p_mad_addr->static_rate;
@@ -175,9 +174,9 @@ __osm_mtl_conv_osm_addr_to_ibmgt_addr(
&p_av->flow_label);
p_av->hop_limit = p_mad_addr->addr_type.gsi.grh_info.hop_limit;
p_av->sgid_index = 0; /* we always use source GID 0 */
- cl_memcpy(&p_av->dgid,
- &p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
- sizeof(ib_net64_t));
+ memcpy(&p_av->dgid,
+ &p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ sizeof(ib_net64_t));
}
}
@@ -196,8 +195,8 @@ __osm_vendor_clear_sm( IN osm_bind_handl
OSM_LOG_ENTER( p_vend->p_log, __osm_vendor_clear_sm );
- cl_memclr( &attr_mod, sizeof( attr_mod ) );
- cl_memclr( &attr_mask, sizeof( attr_mask ) );
+ memset( &attr_mod, 0, sizeof( attr_mod ) );
+ memset( &attr_mask, 0, sizeof( attr_mask ) );
attr_mod.is_sm = FALSE;
attr_mask = HCA_ATTR_IS_SM;
@@ -216,14 +215,13 @@ __osm_vendor_clear_sm( IN osm_bind_handl
OSM_LOG_EXIT( p_vend->p_log );
}
-
/**********************************************************************
* ANY CONSTRUCTION OF THE osm_vendor_t OBJECT
**********************************************************************/
void
osm_vendor_construct( IN osm_vendor_t * const p_vend )
{
- cl_memclr( p_vend, sizeof( *p_vend ) );
+ memset( p_vend, 0, sizeof( *p_vend ) );
}
/**********************************************************************
@@ -519,7 +517,7 @@ __osm_mtl_rcv_callback( IN IB_MGT_mad_hn
p_new_vw->mad_buf_p = mad_buf_p;
/* HACK: We do not support RMPP in receiving MADS */
- cl_memcpy( p_new_vw->mad_buf_p, payload_p, MAD_BLOCK_SIZE );
+ memcpy( p_new_vw->mad_buf_p, payload_p, MAD_BLOCK_SIZE );
/* attach the buffer to the wrapper */
madw_p->p_mad = mad_buf_p;
@@ -676,7 +674,7 @@ osm_vendor_bind( IN osm_vendor_t * const
/* create the bind object tracking this binding */
p_bind = (osm_mtl_bind_info_t *)cl_malloc( sizeof(osm_mtl_bind_info_t) );
- cl_memclr(p_bind, sizeof(osm_mtl_bind_info_t));
+ memset(p_bind, 0, sizeof(osm_mtl_bind_info_t));
if( p_bind == NULL )
{
osm_log( p_vend->p_log, OSM_LOG_ERROR,
@@ -686,7 +684,7 @@ osm_vendor_bind( IN osm_vendor_t * const
}
/* track this bind request info */
- cl_memcpy( p_bind->hca_id, hca_id, sizeof( VAPI_hca_id_t ) );
+ memcpy( p_bind->hca_id, hca_id, sizeof( VAPI_hca_id_t ) );
p_bind->port_num = port_num;
p_bind->p_vend = p_vend;
p_bind->client_context = context;
@@ -884,7 +882,7 @@ osm_vendor_get( IN osm_bind_handle_t h_b
goto Exit;
}
- cl_memclr( mad_p, p_vw->size );
+ memset( mad_p, 0, p_vw->size );
/* track locally */
p_vw->mad_buf_p = mad_p;
@@ -975,7 +973,7 @@ osm_mtl_send_mad(
else
{
/* is a directed route - we need to construct a permissive address */
- cl_memclr( &av, sizeof( av ) );
+ memset( &av, 0, sizeof( av ) );
/* we do not need port number since it is part of the mad_hndl */
av.dlid = IB_LID_PERMISSIVE;
}
@@ -1149,8 +1147,8 @@ osm_vendor_set_sm(
OSM_LOG_ENTER( p_vend->p_log, osm_vendor_set_sm );
- cl_memclr( &attr_mod, sizeof( attr_mod ) );
- cl_memclr( &attr_mask, sizeof( attr_mask ) );
+ memset( &attr_mod, 0, sizeof( attr_mod ) );
+ memset( &attr_mask, 0, sizeof( attr_mask ) );
attr_mod.is_sm = is_sm_val;
attr_mask = HCA_ATTR_IS_SM;
Index: osm/libvendor/osm_vendor_al.c
===================================================================
--- osm/libvendor/osm_vendor_al.c (revision 7286)
+++ osm/libvendor/osm_vendor_al.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -948,7 +948,7 @@ __osm_vendor_init_av(
IN const osm_al_bind_info_t* p_bind,
IN ib_av_attr_t* p_av )
{
- cl_memclr( p_av, sizeof(*p_av) );
+ memset( p_av, 0, sizeof(*p_av) );
p_av->port_num = p_bind->port_num;
p_av->dlid = IB_LID_PERMISSIVE;
}
@@ -1023,7 +1023,7 @@ osm_vendor_bind(
/*
Get the proper QP.
*/
- cl_memclr( &qp_create, sizeof(qp_create) );
+ memset( &qp_create, 0, sizeof(qp_create) );
switch( p_user_bind->mad_class )
{
@@ -1065,7 +1065,7 @@ osm_vendor_bind(
CL_ASSERT( p_bind->h_qp );
CL_ASSERT( p_bind->pool_key );
- cl_memclr( &mad_svc, sizeof(mad_svc) );
+ memset( &mad_svc, 0, sizeof(mad_svc) );
mad_svc.mad_svc_context = p_bind;
mad_svc.pfn_mad_send_cb = __osm_al_send_callback;
@@ -1259,7 +1259,7 @@ osm_vendor_send(
*/
if( p_mad->mgmt_class != IB_MCLASS_SUBN_DIR )
{
- cl_memclr( &av, sizeof(av) );
+ memset( &av, 0, sizeof(av) );
av.port_num = p_bind->port_num;
av.dlid = p_mad_addr->dest_lid;
av.static_rate = p_mad_addr->static_rate;
@@ -1427,7 +1427,7 @@ osm_vendor_set_sm(
OSM_LOG_ENTER( p_vend->p_log, osm_vendor_set_sm );
- cl_memclr( &attr_mod, sizeof(attr_mod) );
+ memset( &attr_mod, 0, sizeof(attr_mod) );
attr_mod.cap.sm = is_sm_val;
Index: osm/libvendor/osm_vendor_mlx_ts_anafa.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_ts_anafa.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_ts_anafa.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -283,7 +283,7 @@ osmv_transport_mad_send (IN const osm_bi
/*
* Copy the MAD over to the sent mad
*/
- cl_memcpy (&ts_mad, p_mad_hdr, MAD_BLOCK_SIZE);
+ memcpy (&ts_mad, p_mad_hdr, MAD_BLOCK_SIZE);
/*
* For all sends other than directed route SM MADs,
@@ -415,9 +415,9 @@ __osmv_TOPSPIN_ANAFA_mad_addr_to_osm_add
p_rcv_desc->grh.traffic_class,
p_rcv_desc->grh.flow_label);
p_mad_addr->addr_type.gsi.grh_info.hop_limit = p_rcv_desc->grh.hop_limit;
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.src_gid.raw,
&p_rcv_desc->grh.sgid, sizeof(ib_net64_t));
- cl_memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
+ memcpy(&p_mad_addr->addr_type.gsi.grh_info.dest_gid.raw,
p_rcv_desc->grh.dgid, sizeof(ib_net64_t));
}
*/
Index: osm/libvendor/osm_vendor_mlx.c
===================================================================
--- osm/libvendor/osm_vendor_mlx.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -632,8 +632,8 @@ osm_vendor_set_sm(
OSM_LOG_ENTER( p_vend->p_log, osm_vendor_set_sm );
- cl_memclr( &attr_mod, sizeof( attr_mod ) );
- cl_memclr( &attr_mask, sizeof( attr_mask ) );
+ memset( &attr_mod, 0, sizeof( attr_mod ) );
+ memset( &attr_mask, 0, sizeof( attr_mask ) );
attr_mod.is_sm = is_sm_val;
attr_mask = HCA_ATTR_IS_SM;
Index: osm/libvendor/osm_vendor_mlx_hca_anafa.c
===================================================================
--- osm/libvendor/osm_vendor_mlx_hca_anafa.c (revision 7286)
+++ osm/libvendor/osm_vendor_mlx_hca_anafa.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -71,7 +71,7 @@ typedef struct _osm_ca_info {
ib_api_status_t
__osm_vendor_gid_to_guid (IN tTS_IB_GID gid, OUT ib_net64_t * p_guid)
{
- cl_memcpy (p_guid, gid + 8, 8);
+ memcpy (p_guid, gid + 8, 8);
return (IB_SUCCESS);
}
Index: osm/complib/cl_timer.c
===================================================================
--- osm/complib/cl_timer.c (revision 7286)
+++ osm/complib/cl_timer.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -221,7 +221,7 @@ void
cl_timer_construct(
IN cl_timer_t* const p_timer )
{
- cl_memclr( p_timer, sizeof(cl_timer_t) );
+ memset( p_timer, 0, sizeof(cl_timer_t) );
p_timer->state = CL_UNINITIALIZED;
}
Index: osm/complib/cl_ptr_vector.c
===================================================================
--- osm/complib/cl_ptr_vector.c (revision 7286)
+++ osm/complib/cl_ptr_vector.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -61,7 +61,7 @@ cl_ptr_vector_construct(
{
CL_ASSERT( p_vector );
- cl_memclr( p_vector, sizeof(cl_ptr_vector_t) );
+ memset( p_vector, 0, sizeof(cl_ptr_vector_t) );
p_vector->state = CL_UNINITIALIZED;
}
@@ -220,7 +220,7 @@ cl_ptr_vector_set_capacity(
if( p_vector->p_ptr_array )
{
/* Copy the old pointer array into the new. */
- cl_memcpy( p_new_ptr_array, p_vector->p_ptr_array,
+ memcpy( p_new_ptr_array, p_vector->p_ptr_array,
p_vector->capacity * sizeof(void*) );
/* Free the old pointer array. */
Index: osm/complib/cl_perf.c
===================================================================
--- osm/complib/cl_perf.c (revision 7286)
+++ osm/complib/cl_perf.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -78,7 +78,7 @@ void
__cl_perf_construct(
IN cl_perf_t* const p_perf )
{
- cl_memclr( p_perf, sizeof(cl_perf_t) );
+ memset( p_perf, 0, sizeof(cl_perf_t) );
p_perf->state = CL_UNINITIALIZED;
}
Index: osm/complib/cl_threadpool.c
===================================================================
--- osm/complib/cl_threadpool.c (revision 7286)
+++ osm/complib/cl_threadpool.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -93,7 +93,7 @@ cl_thread_pool_construct(
{
CL_ASSERT( p_thread_pool);
- cl_memclr( p_thread_pool, sizeof(cl_thread_pool_t) );
+ memset( p_thread_pool, 0, sizeof(cl_thread_pool_t) );
cl_event_construct( &p_thread_pool->wakeup_event );
cl_event_construct( &p_thread_pool->destroy_event );
cl_list_construct( &p_thread_pool->thread_list );
Index: osm/complib/cl_vector.c
===================================================================
--- osm/complib/cl_vector.c (revision 7286)
+++ osm/complib/cl_vector.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -86,7 +86,7 @@ cl_vector_copy_general(
IN const void* const p_src,
IN const size_t size )
{
- cl_memcpy( p_dest, p_src, size );
+ memcpy( p_dest, p_src, size );
}
@@ -212,7 +212,7 @@ cl_vector_construct(
{
CL_ASSERT( p_vector );
- cl_memclr( p_vector, sizeof(cl_vector_t) );
+ memset( p_vector, 0, sizeof(cl_vector_t) );
p_vector->state = CL_UNINITIALIZED;
}
@@ -412,7 +412,7 @@ cl_vector_set_capacity(
if( p_vector->p_ptr_array )
{
/* Copy the old pointer array into the new. */
- cl_memcpy( p_new_ptr_array, p_vector->p_ptr_array,
+ memcpy( p_new_ptr_array, p_vector->p_ptr_array,
p_vector->capacity * sizeof(void*) );
/* Free the old pointer array. */
Index: osm/complib/cl_memory.c
===================================================================
--- osm/complib/cl_memory.c (revision 7286)
+++ osm/complib/cl_memory.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -259,7 +259,7 @@ cl_mem_check( void )
else
{
/* obtain the size from the header */
- cl_memcpy(&size, (char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, sizeof(size));
+ memcpy(&size, (char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, sizeof(size));
if (memcmp((char*)p_mem + sizeof(size) + _MEM_DEBUG_MAGIC_SIZE_ + size,
&_MEM_DEBUG_MAGIC_END_, _MEM_DEBUG_MAGIC_SIZE_))
@@ -322,12 +322,12 @@ __cl_malloc_trk(
if( !p_mem )
return( NULL );
/* now poisen */
- cl_memset(p_mem, 0xA5, size + _MEM_DEBUG_EXTRA_SIZE_);
+ memset(p_mem, 0xA5, size + _MEM_DEBUG_EXTRA_SIZE_);
/* special layout */
- cl_memcpy(p_mem, &_MEM_DEBUG_MAGIC_START_, _MEM_DEBUG_MAGIC_SIZE_);
- cl_memcpy((char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, &size, sizeof(size));
- cl_memcpy((char*)p_mem + sizeof(size) + size + _MEM_DEBUG_MAGIC_SIZE_,
- &_MEM_DEBUG_MAGIC_END_, _MEM_DEBUG_MAGIC_SIZE_);
+ memcpy(p_mem, &_MEM_DEBUG_MAGIC_START_, _MEM_DEBUG_MAGIC_SIZE_);
+ memcpy((char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, &size, sizeof(size));
+ memcpy((char*)p_mem + sizeof(size) + size + _MEM_DEBUG_MAGIC_SIZE_,
+ &_MEM_DEBUG_MAGIC_END_, _MEM_DEBUG_MAGIC_SIZE_);
p_mem = (char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_ + sizeof(size);
#endif
@@ -363,7 +363,7 @@ __cl_malloc_trk(
return( p_mem );
}
}
- cl_memcpy( p_hdr->file_name, temp_buf, FILE_NAME_LENGTH );
+ memcpy( p_hdr->file_name, temp_buf, FILE_NAME_LENGTH );
p_hdr->line_num = temp_line;
/*
* We store the pointer to the memory returned to the user. This allows
@@ -401,7 +401,7 @@ __cl_zalloc_trk(
p_buffer = __cl_malloc_trk( p_file_name, line_num, size );
if( p_buffer )
- cl_memclr( p_buffer, size );
+ memset( p_buffer, 0, size );
return( p_buffer );
}
@@ -415,7 +415,7 @@ __cl_zalloc_ntrk(
p_buffer = __cl_malloc_priv( size );
if( p_buffer )
- cl_memclr( p_buffer, size );
+ memset( p_buffer, 0, size );
return( p_buffer );
}
@@ -504,7 +504,7 @@ __cl_free_trk(
else
{
/* obtain the size from the header */
- cl_memcpy(&size, (char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, sizeof(size));
+ memcpy(&size, (char*)p_mem + _MEM_DEBUG_MAGIC_SIZE_, sizeof(size));
if (memcmp((char*)p_mem + sizeof(size) + _MEM_DEBUG_MAGIC_SIZE_ + size,
&_MEM_DEBUG_MAGIC_END_, _MEM_DEBUG_MAGIC_SIZE_))
@@ -514,7 +514,7 @@ __cl_free_trk(
);
}
/* now poisen */
- cl_memset(p_mem, 0x5A, size + _MEM_DEBUG_EXTRA_SIZE_);
+ memset(p_mem, 0x5A, size + _MEM_DEBUG_EXTRA_SIZE_);
}
__cl_free_priv( p_mem );
}
Index: osm/complib/cl_pool.c
===================================================================
--- osm/complib/cl_pool.c (revision 7286)
+++ osm/complib/cl_pool.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -70,7 +70,7 @@ cl_qcpool_construct(
{
CL_ASSERT( p_pool );
- cl_memclr( p_pool, sizeof(cl_qcpool_t) );
+ memset( p_pool, 0, sizeof(cl_qcpool_t) );
p_pool->state = CL_UNINITIALIZED;
}
@@ -126,7 +126,7 @@ cl_qcpool_init(
(void**)(p_pool->component_sizes + num_components);
/* Copy the user's sizes into our array for future use. */
- cl_memcpy( p_pool->component_sizes, component_sizes,
+ memcpy( p_pool->component_sizes, component_sizes,
sizeof(uint32_t) * num_components );
/* Store the number of components per object. */
@@ -452,7 +452,7 @@ void
cl_qpool_construct(
IN cl_qpool_t* const p_pool )
{
- cl_memclr( p_pool, sizeof(cl_qpool_t) );
+ memset( p_pool, 0, sizeof(cl_qpool_t) );
cl_qcpool_construct( &p_pool->qcpool );
}
@@ -562,7 +562,7 @@ cl_cpool_construct(
{
CL_ASSERT( p_pool );
- cl_memclr( p_pool, sizeof(cl_cpool_t) );
+ memset( p_pool, 0, sizeof(cl_cpool_t) );
cl_qcpool_construct( &p_pool->qcpool );
}
@@ -680,7 +680,7 @@ cl_pool_construct(
{
CL_ASSERT( p_pool );
- cl_memclr( p_pool, sizeof(cl_pool_t) );
+ memset( p_pool, 0, sizeof(cl_pool_t) );
cl_qcpool_construct( &p_pool->qcpool );
}
Index: osm/complib/cl_map.c
===================================================================
--- osm/complib/cl_map.c (revision 7286)
+++ osm/complib/cl_map.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -233,7 +233,7 @@ cl_qmap_init(
{
CL_ASSERT( p_map );
- cl_memclr( p_map, sizeof(cl_qmap_t) );
+ memset( p_map, 0, sizeof(cl_qmap_t) );
/* special setup for the root node */
p_map->root.p_up = &p_map->root;
@@ -1268,7 +1268,7 @@ cl_fmap_init(
CL_ASSERT( p_map );
CL_ASSERT( pfn_compare );
- cl_memclr( p_map, sizeof(cl_fmap_t) );
+ memset( p_map, 0, sizeof(cl_fmap_t) );
/* special setup for the root node */
p_map->root.p_up = &p_map->root;
Index: osm/complib/cl_memory_osd.c
===================================================================
--- osm/complib/cl_memory_osd.c (revision 7286)
+++ osm/complib/cl_memory_osd.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -69,30 +69,3 @@ __cl_free_priv(
free( p_memory );
}
-void
-cl_memset(
- IN void* const p_memory,
- IN const uint8_t fill,
- IN const size_t count )
-{
- memset( p_memory, fill, count );
-}
-
-void*
-cl_memcpy(
- IN void* const p_dest,
- IN const void* const p_src,
- IN const size_t count )
-{
- return( memcpy( p_dest, p_src, count ) );
-}
-
-int32_t
-cl_memcmp(
- IN const void* const p_mem,
- IN const void* const p_ref,
- IN const size_t count )
-{
- return( memcmp( p_mem, p_ref, count ) );
-}
-
Index: osm/osmtest/osmtest.c
===================================================================
--- osm/osmtest/osmtest.c (revision 7286)
+++ osm/osmtest/osmtest.c (working copy)
@@ -435,7 +435,7 @@ subnet_init( IN subnet_t * const p_subn
void
osmtest_construct( IN osmtest_t * const p_osmt )
{
- cl_memclr( p_osmt, sizeof( *p_osmt ) );
+ memset( p_osmt, 0, sizeof( *p_osmt ) );
osm_log_construct( &p_osmt->log );
subnet_construct( &p_osmt->exp_subn );
}
@@ -616,8 +616,8 @@ osmtest_get_all_recs( IN osmtest_t * con
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
p_context->p_osmt = p_osmt;
user.attr_id = attr_id;
@@ -693,7 +693,7 @@ osmtest_validate_sa_class_port_info( IN
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
+ memset( &req, 0, sizeof( req ) );
p_context->p_osmt = p_osmt;
req.query_type = OSMV_QUERY_CLASS_PORT_INFO;
@@ -787,9 +787,9 @@ osmtest_get_node_rec( IN osmtest_t * con
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.node_info.node_guid = node_guid;
@@ -874,9 +874,9 @@ osmtest_get_node_rec_by_lid( IN osmtest_
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.lid = lid;
@@ -946,7 +946,7 @@ osmtest_get_path_rec_by_guid_pair( IN os
OSM_LOG_ENTER( &p_osmt->log, osmtest_get_path_rec_by_guid_pair);
- cl_memclr( p_context, sizeof( *p_context ) );
+ memset( p_context, 0, sizeof( *p_context ) );
p_context->p_osmt = p_osmt;
req.timeout_ms = p_osmt->opt.transaction_timeout;
@@ -1022,7 +1022,7 @@ osmtest_get_multipath_rec( IN osmtest_t
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
+ memset( &req, 0, sizeof( req ) );
p_context->p_osmt = p_osmt;
req.timeout_ms = p_osmt->opt.transaction_timeout;
@@ -1099,9 +1099,9 @@ osmtest_get_port_rec( IN osmtest_t * con
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.lid = lid;
@@ -1183,9 +1183,9 @@ osmtest_get_port_rec_by_num( IN osmtest_
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.lid = lid;
record.port_num = port_num;
@@ -1254,7 +1254,7 @@ osmtest_stress_port_recs_large( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_stress_port_recs_large );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
*/
@@ -1319,7 +1319,7 @@ osmtest_stress_node_recs_large( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_stress_node_recs_large );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -1385,7 +1385,7 @@ osmtest_stress_path_recs_large( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_stress_path_recs_large );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all Records in the subnet.
@@ -1452,7 +1452,7 @@ osmtest_stress_path_recs_by_guid ( IN os
OSM_LOG_ENTER( &p_osmt->log, osmtest_stress_path_recs_by_guid );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -1557,7 +1557,7 @@ osmtest_stress_port_recs_small( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_stress_port_recs_small );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for our own PortRecord in the subnet.
@@ -1642,9 +1642,9 @@ osmtest_wrong_sm_key_ignored( IN osmtest
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.lid = p_osmt->local_port.sm_lid;
record.port_num = port_num;
@@ -1947,7 +1947,7 @@ osmtest_write_all_link_recs( IN osmtest_
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_link_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -2023,7 +2023,7 @@ osmtest_get_path_rec_by_lid_pair( IN osm
OSM_LOG_ENTER( &p_osmt->log, osmtest_get_path_rec_by_lid_pair);
- cl_memclr( p_context, sizeof( *p_context ) );
+ memset( p_context, 0, sizeof( *p_context ) );
p_context->p_osmt = p_osmt;
req.timeout_ms = p_osmt->opt.transaction_timeout;
@@ -2094,7 +2094,7 @@ osmtest_write_all_node_recs( IN osmtest_
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_node_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -2169,7 +2169,7 @@ osmtest_write_all_port_recs( IN osmtest_
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_port_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -2244,7 +2244,7 @@ osmtest_write_all_path_recs(
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_path_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all records in the subnet.
@@ -2340,7 +2340,7 @@ osmtest_write_all_node_recs(
for (lid = 1; lid <= p_osmt->max_lid; lid++)
{
/* prepare the qury context */
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
status = osmtest_get_node_rec_by_lid( p_osmt, cl_ntoh16( lid ), &context );
if( status != IB_SUCCESS )
@@ -2430,7 +2430,7 @@ osmtest_write_all_port_recs( IN osmtest_
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_port_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/* print header */
result = fprintf( fh, "#\n" "# PortInfo Records\n" "#\n" );
@@ -2459,7 +2459,7 @@ osmtest_write_all_port_recs( IN osmtest_
for (port_num = 0; port_num <= p_node_rec->node_info.num_ports; port_num++)
{
/* prepare the qury context */
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
status = osmtest_get_port_rec_by_num( p_osmt,
p_node_rec->lid,
@@ -2545,7 +2545,7 @@ osmtest_write_all_path_recs( IN osmtest_
OSM_LOG_ENTER( &p_osmt->log, osmtest_write_all_path_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Go over all nodes that exist in the subnet
@@ -4006,7 +4006,7 @@ osmtest_validate_all_node_recs( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_all_node_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -4090,7 +4090,7 @@ osmtest_validate_all_guidinfo_recs( IN o
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_all_guidinfo_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all GuidInfoRecords in the subnet.
@@ -4146,7 +4146,7 @@ osmtest_validate_all_path_recs( IN osmte
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_all_path_recs );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all PathRecords in the subnet.
@@ -4230,7 +4230,7 @@ osmtest_validate_single_path_rec_lid_pai
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_single_path_rec_lid_pair );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
status = osmtest_get_path_rec_by_lid_pair( p_osmt,
p_path->rec.slid,
@@ -4307,10 +4307,10 @@ osmtest_validate_single_node_rec_lid( IN
cl_ntoh16( lid ) );
}
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &record, sizeof( record ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &record, 0, sizeof( record ) );
record.lid = lid;
@@ -4404,7 +4404,7 @@ osmtest_validate_single_port_rec_lid( IN
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_single_port_rec_lid );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
osmtest_get_port_rec_by_num( p_osmt,
@@ -4461,7 +4461,7 @@ osmtest_validate_single_path_rec_guid_pa
OSM_LOG_ENTER( &p_osmt->log, osmtest_validate_single_path_rec_guid_pair );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
if( osm_log_is_active( &p_osmt->log, OSM_LOG_DEBUG ) )
{
@@ -4814,8 +4814,8 @@ osmtest_validate_against_db( IN osmtest_
goto Exit;
#if defined (VENDOR_RMPP_SUPPORT) && defined (DUAL_SIDED_RMPP)
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &request, sizeof( request ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &request, 0, sizeof( request ) );
request.comp_mask = IB_MPR_COMPMASK_SGIDCOUNT | IB_MPR_COMPMASK_DGIDCOUNT;
request.sgid_count = 1;
request.dgid_count = 1;
@@ -4825,8 +4825,8 @@ osmtest_validate_against_db( IN osmtest_
if( status != IB_SUCCESS )
goto Exit;
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &request, sizeof( request ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &request, 0, sizeof( request ) );
status = osmtest_get_multipath_rec( p_osmt, &request, &context );
if( status == IB_SUCCESS )
goto Exit;
@@ -4837,8 +4837,8 @@ osmtest_validate_against_db( IN osmtest_
"IS EXPECTED ERROR ^^^^\n");
}
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &request, sizeof( request ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &request, 0, sizeof( request ) );
request.comp_mask = IB_MPR_COMPMASK_SGIDCOUNT;
request.sgid_count = 1;
ib_gid_set_default( &request.gids[0], portguid );
@@ -4852,8 +4852,8 @@ osmtest_validate_against_db( IN osmtest_
"IS EXPECTED ERROR ^^^^\n");
}
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &request, sizeof( request ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &request, 0, sizeof( request ) );
request.comp_mask = IB_MPR_COMPMASK_SGIDCOUNT | IB_MPR_COMPMASK_DGIDCOUNT;
request.sgid_count = 1;
request.dgid_count = 1;
@@ -4871,7 +4871,7 @@ osmtest_validate_against_db( IN osmtest_
"IS EXPECTED ERROR ^^^^\n");
}
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
request.comp_mask = IB_MPR_COMPMASK_SGIDCOUNT | IB_MPR_COMPMASK_DGIDCOUNT;
request.sgid_count = 1;
request.dgid_count = 1;
@@ -4889,8 +4889,8 @@ osmtest_validate_against_db( IN osmtest_
"IS EXPECTED ERROR ^^^^\n");
}
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &request, sizeof( request ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &request, 0, sizeof( request ) );
request.comp_mask = IB_MPR_COMPMASK_SGIDCOUNT | IB_MPR_COMPMASK_DGIDCOUNT |
IB_MPR_COMPMASK_NUMBPATH;
request.sgid_count = 2;
@@ -6216,8 +6216,8 @@ osmtest_bind( IN osmtest_t * p_osmt,
/*
* Copy the port info for the selected port.
*/
- cl_memcpy( &p_osmt->local_port, &attr_array[port_index],
- sizeof( p_osmt->local_port ) );
+ memcpy( &p_osmt->local_port, &attr_array[port_index],
+ sizeof( p_osmt->local_port ) );
/* bind to the SA */
osm_log( &p_osmt->log, OSM_LOG_DEBUG,
Index: osm/osmtest/osmt_service.c
===================================================================
--- osm/osmtest/osmt_service.c (revision 7286)
+++ osm/osmtest/osmt_service.c (working copy)
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2006 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -83,10 +84,10 @@ osmt_register_service( IN osmtest_t * co
"Registering service: name: %s id: 0x%" PRIx64 "\n",
service_name, cl_ntoh64(service_id));
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
/* set the new service record fields */
svc_rec.service_id = service_id;
@@ -94,10 +95,10 @@ osmt_register_service( IN osmtest_t * co
svc_rec.service_gid.unicast.prefix = 0;
svc_rec.service_gid.unicast.interface_id = p_osmt->local_port.port_guid;
svc_rec.service_lease = service_lease;
- cl_memclr(&svc_rec.service_key,16*sizeof(uint8_t));
+ memset(&svc_rec.service_key, 0, 16*sizeof(uint8_t));
svc_rec.service_key[0] = service_key_lsb;
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memcpy(svc_rec.service_name, service_name,
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memcpy(svc_rec.service_name, service_name,
(strlen(service_name)+1)*sizeof(char));
/* prepare the data used for this query */
@@ -198,10 +199,10 @@ osmt_register_service_with_full_key ( IN
"Registering service: name: %s id: 0x%" PRIx64 "\n",
service_name, cl_ntoh64(service_id));
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
/* set the new service record fields */
svc_rec.service_id = service_id;
@@ -209,12 +210,12 @@ osmt_register_service_with_full_key ( IN
svc_rec.service_gid.unicast.prefix = 0;
svc_rec.service_gid.unicast.interface_id = p_osmt->local_port.port_guid;
svc_rec.service_lease = service_lease;
- cl_memclr(&svc_rec.service_key,16*sizeof(uint8_t));
- cl_memcpy(svc_rec.service_key,service_key,16*sizeof(uint8_t));
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memclr(skey, 16*sizeof(uint8_t));
- cl_memcpy(svc_rec.service_name, service_name,
- (strlen(service_name)+1)*sizeof(char));
+ memset(&svc_rec.service_key, 0, 16*sizeof(uint8_t));
+ memcpy(svc_rec.service_key,service_key, 16*sizeof(uint8_t));
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memset(skey, 0, 16*sizeof(uint8_t));
+ memcpy(svc_rec.service_name, service_name,
+ (strlen(service_name)+1)*sizeof(char));
/* prepare the data used for this query */
/* sa_mad_data.method = IB_MAD_METHOD_SET; */
@@ -275,7 +276,7 @@ osmt_register_service_with_full_key ( IN
i,service_key[i],i,p_rec->service_key[i]);
}
/* since c15-0.1.14 not supported all key association queries should bring in return zero in service key */
- if (cl_memcmp(skey,p_rec->service_key,16*sizeof(uint8_t)) != 0)
+ if (memcmp(skey,p_rec->service_key,16*sizeof(uint8_t)) != 0)
{
status = IB_REMOTE_ERROR;
osm_log( &p_osmt->log, OSM_LOG_ERROR,
@@ -340,10 +341,10 @@ osmt_register_service_with_data( IN osmt
"Registering service: name: %s id: 0x%" PRIx64 "\n",
service_name, cl_ntoh64(service_id));
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
/* set the new service record fields */
svc_rec.service_id = service_id;
@@ -351,18 +352,18 @@ osmt_register_service_with_data( IN osmt
svc_rec.service_gid.unicast.prefix = 0;
svc_rec.service_gid.unicast.interface_id = p_osmt->local_port.port_guid;
svc_rec.service_lease = service_lease;
- cl_memclr(&svc_rec.service_key,16*sizeof(uint8_t));
+ memset(&svc_rec.service_key, 0, 16*sizeof(uint8_t));
svc_rec.service_key[0] = service_key_lsb;
/* Copy data to service_data arrays */
- cl_memcpy(svc_rec.service_data8,service_data8,16*sizeof(uint8_t));
- cl_memcpy(svc_rec.service_data16,service_data16,8*sizeof(ib_net16_t));
- cl_memcpy(svc_rec.service_data32,service_data32,4*sizeof(ib_net32_t));
- cl_memcpy(svc_rec.service_data64,service_data64,2*sizeof(ib_net64_t));
-
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memcpy(svc_rec.service_name, service_name,
- (strlen(service_name)+1)*sizeof(char));
+ memcpy(svc_rec.service_data8, service_data8, 16*sizeof(uint8_t));
+ memcpy(svc_rec.service_data16, service_data16, 8*sizeof(ib_net16_t));
+ memcpy(svc_rec.service_data32, service_data32, 4*sizeof(ib_net32_t));
+ memcpy(svc_rec.service_data64, service_data64, 2*sizeof(ib_net64_t));
+
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memcpy(svc_rec.service_name, service_name,
+ (strlen(service_name)+1)*sizeof(char));
/* prepare the data used for this query */
/* sa_mad_data.method = IB_MAD_METHOD_SET; */
@@ -455,10 +456,10 @@ osmt_register_service_with_data( IN osmt
p_rec = osmv_get_query_svc_rec( context.result.p_result_madw, 0 );
osm_log( &p_osmt->log, OSM_LOG_VERBOSE,
"Comparing service data...\n");
- if (cl_memcmp(service_data8,p_rec->service_data8,16*sizeof(uint8_t)) != 0 ||
- cl_memcmp(service_data16,p_rec->service_data16,8*sizeof(uint16_t)) != 0 ||
- cl_memcmp(service_data32,p_rec->service_data32,4*sizeof(uint32_t)) != 0 ||
- cl_memcmp(service_data64,p_rec->service_data64,2*sizeof(uint64_t)) != 0
+ if (memcmp(service_data8,p_rec->service_data8,16*sizeof(uint8_t)) != 0 ||
+ memcmp(service_data16,p_rec->service_data16,8*sizeof(uint16_t)) != 0 ||
+ memcmp(service_data32,p_rec->service_data32,4*sizeof(uint32_t)) != 0 ||
+ memcmp(service_data64,p_rec->service_data64,2*sizeof(uint64_t)) != 0
)
{
status = IB_REMOTE_ERROR;
@@ -509,8 +510,8 @@ osmt_get_service_by_id_and_name ( IN osm
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -523,12 +524,12 @@ osmt_get_service_by_id_and_name ( IN osm
req.pfn_query_cb = osmtest_query_res_cb;
req.sm_key = 0;
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
+ memset( &user, 0, sizeof( user ) );
/* set the new service record fields */
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memcpy(svc_rec.service_name, sr_name,
- (strlen(sr_name)+1)*sizeof(char));
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memcpy(svc_rec.service_name, sr_name,
+ (strlen(sr_name)+1)*sizeof(char));
svc_rec.service_id = sid;
req.p_query_input = &user;
@@ -648,8 +649,8 @@ osmt_get_service_by_id ( IN osmtest_t *
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -662,8 +663,8 @@ osmt_get_service_by_id ( IN osmtest_t *
req.pfn_query_cb = osmtest_query_res_cb;
req.sm_key = 0;
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
+ memset( &user, 0, sizeof( user ) );
/* set the new service record fields */
svc_rec.service_id = sid;
req.p_query_input = &user;
@@ -796,8 +797,8 @@ osmt_get_service_by_name_and_key ( IN os
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -810,12 +811,12 @@ osmt_get_service_by_name_and_key ( IN os
req.pfn_query_cb = osmtest_query_res_cb;
req.sm_key = 0;
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
+ memset( &user, 0, sizeof( user ) );
/* set the new service record fields */
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memcpy(svc_rec.service_name, sr_name,
- (strlen(sr_name)+1)*sizeof(char));
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memcpy(svc_rec.service_name, sr_name,
+ (strlen(sr_name)+1)*sizeof(char));
for (i = 0; i <= 15; i++)
svc_rec.service_key[i] = skey[i];
@@ -937,8 +938,8 @@ osmt_get_service_by_name( IN osmtest_t *
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -951,8 +952,8 @@ osmt_get_service_by_name( IN osmtest_t *
req.pfn_query_cb = osmtest_query_res_cb;
req.sm_key = 0;
- cl_memclr(service_name, sizeof(service_name));
- cl_memcpy(service_name, sr_name, (strlen(sr_name)+1)*sizeof(char));
+ memset(service_name, 0, sizeof(service_name));
+ memcpy(service_name, sr_name, (strlen(sr_name)+1)*sizeof(char));
req.p_query_input = service_name;
status = osmv_query_sa( p_osmt->h_bind, &req );
@@ -1073,8 +1074,8 @@ osmt_get_all_services_and_check_names( I
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -1189,7 +1190,7 @@ osmt_delete_service_by_name(IN osmtest_t
"Trying to Delete service name: %s\n",
sr_name);
- cl_memclr( &svc_rec, sizeof( svc_rec ) );
+ memset( &svc_rec, 0, sizeof( svc_rec ) );
status = osmt_get_service_by_name(p_osmt, sr_name,rec_num, &svc_rec);
if (status != IB_SUCCESS)
@@ -1201,14 +1202,14 @@ osmt_delete_service_by_name(IN osmtest_t
goto ExitNoDel;
}
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( &user, 0, sizeof( user ) );
/* set the new service record fields */
- cl_memclr(svc_rec.service_name, sizeof(svc_rec.service_name));
- cl_memcpy(svc_rec.service_name, sr_name,
- (strlen(sr_name)+1)*sizeof(char));
+ memset(svc_rec.service_name, 0, sizeof(svc_rec.service_name));
+ memcpy(svc_rec.service_name, sr_name,
+ (strlen(sr_name)+1)*sizeof(char));
/* prepare the data used for this query */
context.p_osmt = p_osmt;
@@ -1384,14 +1385,14 @@ osmt_run_service_records_flow( IN osmtes
/* Generate 2 instances of service record with consecutive data */
for (instance = 0 ; instance < 2 ; instance++) {
/* First, clear all arrays */
- cl_memclr (service_data8,16*sizeof(uint8_t));
- cl_memclr (service_data16,8*sizeof(uint16_t));
- cl_memclr (service_data32,4*sizeof(uint32_t));
- cl_memclr (service_data64,2*sizeof(uint64_t));
- service_data8[instance]=instance+1;
- service_data16[instance]=cl_hton16(instance+2);
- service_data32[instance]=cl_hton32(instance+3);
- service_data64[instance]=cl_hton64(instance+4);
+ memset (service_data8, 0, 16*sizeof(uint8_t));
+ memset (service_data16, 0, 8*sizeof(uint16_t));
+ memset (service_data32, 0, 4*sizeof(uint32_t));
+ memset (service_data64, 0, 2*sizeof(uint64_t));
+ service_data8[instance] = instance+1;
+ service_data16[instance] = cl_hton16(instance+2);
+ service_data32[instance] = cl_hton32(instance+3);
+ service_data64[instance] = cl_hton64(instance+4);
status = osmt_register_service_with_data(
p_osmt,
cl_ntoh64(id[3]), /* IN ib_net64_t service_id, */
@@ -1410,7 +1411,7 @@ osmt_run_service_records_flow( IN osmtes
}
/* Trying to create service with zero key */
- cl_memclr (service_key,16*sizeof(uint8_t));
+ memset (service_key, 0, 16*sizeof(uint8_t));
status = osmt_register_service_with_full_key(
p_osmt,
cl_ntoh64(id[5]), /* IN ib_net64_t service_id, */
@@ -1642,7 +1643,7 @@ osmt_run_service_records_flow( IN osmtes
}
/* Test Service Key */
- cl_memclr(service_key,16*sizeof(uint8_t));
+ memset(service_key, 0, 16*sizeof(uint8_t));
/* Check for service_name[5] with service_key=0 - the service shouldn't
exist with this name. */
@@ -1695,9 +1696,9 @@ osmt_run_service_records_flow( IN osmtes
#ifdef VENDOR_RMPP_SUPPORT
/* These ar the only service_names which are valid */
- cl_memcpy(&service_valid_names[0],&service_name[0],sizeof(uint8_t)*64);
- cl_memcpy(&service_valid_names[1],&service_name[2],sizeof(uint8_t)*64);
- cl_memcpy(&service_valid_names[2],&service_name[6],sizeof(uint8_t)*64);
+ memcpy(&service_valid_names[0], &service_name[0], sizeof(uint8_t)*64);
+ memcpy(&service_valid_names[1], &service_name[2], sizeof(uint8_t)*64);
+ memcpy(&service_valid_names[2], &service_name[6], sizeof(uint8_t)*64);
status = osmt_get_all_services_and_check_names(p_osmt,service_valid_names, 3, &num_recs);
if (status != IB_SUCCESS)
Index: osm/osmtest/osmt_multicast.c
===================================================================
--- osm/osmtest/osmt_multicast.c (revision 7286)
+++ osm/osmtest/osmt_multicast.c (working copy)
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -66,7 +67,7 @@ __match_mgids(
ib_gid_t* p_mgid_list_item = (ib_gid_t*)p_object;
int32_t count;
- count = cl_memcmp(
+ count = memcmp(
p_mgid_context,
p_mgid_list_item,
sizeof(ib_gid_t));
@@ -102,8 +103,8 @@ osmt_query_mcast( IN osmtest_t * const p
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
context.p_osmt = p_osmt;
user.attr_id = IB_MAD_ATTR_MCMEMBER_RECORD;
@@ -205,7 +206,7 @@ osmt_query_mcast( IN osmtest_t * const p
status = IB_ERROR;
goto Exit;
}
- cl_memcpy(&p_mgrp->mcmember_rec,p_rec,sizeof(p_mgrp->mcmember_rec));
+ memcpy(&p_mgrp->mcmember_rec,p_rec,sizeof(p_mgrp->mcmember_rec));
cl_qmap_insert(&p_osmt->exp_subn.mgrp_mlid_tbl,
cl_ntoh16(p_rec->mlid),&p_mgrp->map_item);
}
@@ -241,10 +242,10 @@ osmt_send_mcast_request( IN osmtest_t *
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &context, sizeof( context ) );
- cl_memclr( p_res, sizeof(ib_sa_mad_t ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &context, 0, sizeof( context ) );
+ memset( p_res, 0, sizeof(ib_sa_mad_t ) );
context.p_osmt = p_osmt;
@@ -303,9 +304,9 @@ osmt_send_mcast_request( IN osmtest_t *
}
/* ok it worked */
- cl_memcpy(p_res,
- osm_madw_get_mad_ptr(context.result.p_result_madw),
- sizeof(ib_sa_mad_t));
+ memcpy(p_res,
+ osm_madw_get_mad_ptr(context.result.p_result_madw),
+ sizeof(ib_sa_mad_t));
status = context.result.status;
@@ -340,13 +341,13 @@ void
osmt_init_mc_query_rec(IN osmtest_t * const p_osmt,
IN OUT ib_member_rec_t *p_mc_req) {
/* use default values so we can change only what we want later */
- cl_memclr(p_mc_req,sizeof(ib_member_rec_t));
+ memset(p_mc_req, 0, sizeof(ib_member_rec_t));
/* we leave the MGID to the user */
- cl_memcpy(&p_mc_req->port_gid.unicast.interface_id,
- &p_osmt->local_port.port_guid,
- sizeof(p_osmt->local_port.port_guid)
- );
+ memcpy(&p_mc_req->port_gid.unicast.interface_id,
+ &p_osmt->local_port.port_guid,
+ sizeof(p_osmt->local_port.port_guid)
+ );
/* use our own subnet prefix: */
p_mc_req->port_gid.unicast.prefix = CL_HTON64(0xFE80000000000000ULL);
@@ -527,8 +528,8 @@ osmt_run_mcast_flow( IN osmtest_t * cons
while( p_mgrp != (osmtest_mgrp_t*)cl_qmap_end( p_mgrp_mlid_tbl ) )
{
/* search for ipoib mgid */
- if (!cl_memcmp(&osm_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ipoib_good_mgid)) ||
- !cl_memcmp(&osm_ts_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ts_ipoib_good_mgid)))
+ if (!memcmp(&osm_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ipoib_good_mgid)) ||
+ !memcmp(&osm_ts_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ts_ipoib_good_mgid)))
{
IPoIBIsFound=1;
}
@@ -545,7 +546,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"osmt_run_mcast_flow: "
"Found IPoIB MC Group, so we run SilverStorm Bug Flow...\n");
/* Try to join first like IPoIB of SilverStorm */
- cl_memcpy(&mc_req_rec.mgid,&osm_ipoib_good_mgid,sizeof(ib_gid_t));
+ memcpy(&mc_req_rec.mgid,&osm_ipoib_good_mgid,sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
comp_mask =
@@ -593,7 +594,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
mtu_phys = p_mc_res->mtu ;
rate_phys = p_mc_res->rate ;
- cl_memcpy(&mc_req_rec.mgid,&osm_ipoib_good_mgid,sizeof(ib_gid_t));
+ memcpy(&mc_req_rec.mgid,&osm_ipoib_good_mgid,sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
comp_mask =
@@ -676,7 +677,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
/* Request Get */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
- cl_memclr(&mc_req_rec.port_gid.unicast.interface_id,sizeof(ib_net64_t));
+ memset(&mc_req_rec.port_gid.unicast.interface_id, 0, sizeof(ib_net64_t));
comp_mask =
IB_MCR_COMPMASK_GID;
@@ -710,7 +711,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
" Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -757,7 +758,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
" Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec,IB_MC_REC_STATE_FULL_MEMBER );
@@ -796,7 +797,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
mc_req_rec.mgid.raw[15] = 0x01;
@@ -913,7 +914,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
" Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
);
/* no MGID */
- /* cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t)); */
+ /* memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t)); */
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -1241,7 +1242,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
p_mc_res = ib_sa_mad_get_payload_ptr(&res_sa_mad);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -1324,7 +1325,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
p_mc_res = ib_sa_mad_get_payload_ptr(&res_sa_mad);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -1381,7 +1382,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
p_mc_res = ib_sa_mad_get_payload_ptr(&res_sa_mad);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -1779,7 +1780,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
p_mc_res = ib_sa_mad_get_payload_ptr(&res_sa_mad);
/* no MGID */
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
@@ -2212,7 +2213,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
mc_req_rec.mgid = good_mgid;
mc_req_rec.mgid.raw[12] = 0xFB;
- cl_memcpy(&special_mgid, &mc_req_rec.mgid, sizeof(ib_gid_t));
+ memcpy(&special_mgid, &mc_req_rec.mgid, sizeof(ib_gid_t));
mc_req_rec.scope_state = 0x2F; /* link-local scope, Full member with all other bits turned on */
status = osmt_send_mcast_request( p_osmt, 1,
@@ -2251,7 +2252,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"osmt_run_mcast_flow: "
"Check o15-0.2.4 statement...\n");
/* Try to join */
- cl_memcpy(&mc_req_rec.mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
+ memcpy(&mc_req_rec.mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
/* Request Join */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_NON_MEMBER);
comp_mask =
@@ -2868,7 +2869,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
/* First create new mgrp */
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
mc_req_rec.mtu = IB_MTU_LEN_1024 | IB_PATH_SELECTOR_EXACTLY << 6;
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
comp_mask =
IB_MCR_COMPMASK_MGID |
IB_MCR_COMPMASK_PORT_GID |
@@ -2893,7 +2894,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Failed to create new mgrp\n");
goto Exit;
}
- cl_memcpy(&tmp_mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
+ memcpy(&tmp_mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
osm_dump_mc_record( &p_osmt->log, p_mc_res, OSM_LOG_INFO );
/* tmp_mtu = p_mc_res->mtu & 0x3F; */
@@ -2904,7 +2905,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
" Expecting Errors: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
);
mc_req_rec.mtu = IB_MTU_LEN_4096 | IB_PATH_SELECTOR_GREATER_THAN << 6;
- cl_memcpy(&mc_req_rec.mgid,&tmp_mgid,sizeof(ib_gid_t));
+ memcpy(&mc_req_rec.mgid,&tmp_mgid,sizeof(ib_gid_t));
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
comp_mask =
IB_MCR_COMPMASK_GID |
@@ -2947,7 +2948,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
"Checking Proxy Join...\n"
);
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
/*
* Do a blocking query for all NodeRecords in the subnet.
@@ -2991,7 +2992,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
if (remote_port_guid != 0x0)
{
ib_member_set_join_state(&mc_req_rec, IB_MC_REC_STATE_FULL_MEMBER);
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
mc_req_rec.port_gid.unicast.interface_id = remote_port_guid;
comp_mask =
IB_MCR_COMPMASK_MGID |
@@ -3022,7 +3023,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
}
p_mc_res = ib_sa_mad_get_payload_ptr(&res_sa_mad);
- cl_memcpy(&proxy_mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
+ memcpy(&proxy_mgid,&p_mc_res->mgid,sizeof(ib_gid_t));
/* First try a bad deletion then good one */
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
@@ -3105,7 +3106,7 @@ osmt_run_mcast_flow( IN osmtest_t * cons
IB_LINK_WIDTH_ACTIVE_1X |
IB_PATH_SELECTOR_GREATER_THAN << 6;
mc_req_rec.mlid = max_mlid;
- cl_memclr(&mc_req_rec.mgid,sizeof(ib_gid_t));
+ memset(&mc_req_rec.mgid, 0, sizeof(ib_gid_t));
comp_mask =
IB_MCR_COMPMASK_MGID |
IB_MCR_COMPMASK_PORT_GID |
@@ -3182,14 +3183,14 @@ osmt_run_mcast_flow( IN osmtest_t * cons
while( p_mgrp != (osmtest_mgrp_t*)cl_qmap_end( p_mgrp_mlid_tbl ) )
{
/* Only if different from IPoIB Mgid try to delete */
- if (cl_memcmp(&osm_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ipoib_good_mgid)) &&
- cl_memcmp(&osm_ts_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ts_ipoib_good_mgid)))
+ if (memcmp(&osm_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ipoib_good_mgid)) &&
+ memcmp(&osm_ts_ipoib_good_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(osm_ts_ipoib_good_mgid)))
{
osmt_init_mc_query_rec(p_osmt, &mc_req_rec);
mc_req_rec.mgid = p_mgrp->mcmember_rec.mgid;
/* o15-0.1.4 - need to specify the oppsite state for a valid delete */
- if (!cl_memcmp(&special_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(special_mgid)))
+ if (!memcmp(&special_mgid,&p_mgrp->mcmember_rec.mgid,sizeof(special_mgid)))
{
mc_req_rec.scope_state = 0x2F;
}
Index: osm/osmtest/osmt_slvl_vl_arb.c
===================================================================
--- osm/osmtest/osmt_slvl_vl_arb.c (revision 7286)
+++ osm/osmtest/osmt_slvl_vl_arb.c (working copy)
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -130,9 +131,9 @@ osmt_query_vl_arb(
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
@@ -348,9 +349,9 @@ osmt_query_slvl_map(
*
* The query structures are locals.
*/
- cl_memclr( &req, sizeof( req ) );
- cl_memclr( &user, sizeof( user ) );
- cl_memclr( &context, sizeof( context ) );
+ memset( &req, 0, sizeof( req ) );
+ memset( &user, 0, sizeof( user ) );
+ memset( &context, 0, sizeof( context ) );
context.p_osmt = p_osmt;
Index: osm/osmtest/osmt_inform.c
===================================================================
--- osm/osmtest/osmt_inform.c (revision 7286)
+++ osm/osmtest/osmt_inform.c (working copy)
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -136,7 +137,7 @@ osmt_bind_inform_qp( IN osmtest_t * cons
p_qp_ctx->p_recv_buf = (uint8_t *)p_qp_ctx->qp_bind_hndl.buf_ptr + 2 * (GRH_LEN + MAD_BLOCK_SIZE);
/* Need to clear assigned memory of p_send_buf - before using it to send any data */
- cl_memclr(p_qp_ctx->p_send_buf, MAD_BLOCK_SIZE);
+ memset(p_qp_ctx->p_send_buf, 0, MAD_BLOCK_SIZE);
status = IB_SUCCESS;
osm_log( p_log, OSM_LOG_DEBUG,
@@ -222,7 +223,7 @@ osmt_reg_unreg_inform_info( IN osmtest_t
p_sa_mad->attr_id = IB_MAD_ATTR_INFORM_INFO;
/* copy the reference inform info */
- cl_memcpy(p_ii, p_inform_info, sizeof(ib_inform_info_t));
+ memcpy(p_ii, p_inform_info, sizeof(ib_inform_info_t));
if (reg_flag)
{
@@ -449,7 +450,7 @@ osmt_send_trap_wait_for_forward( IN osmt
p_osmt->local_port.sm_lid);
/* init the MAD */
- cl_memclr(p_smp, sizeof(ib_smp_t));
+ memset(p_smp, 0, sizeof(ib_smp_t));
ib_mad_init_new( (ib_mad_t*)p_smp,
IB_MCLASS_SUBN_LID,
( uint8_t ) 2,
@@ -692,7 +693,7 @@ ib_api_status_t
osmt_init_inform_info(IN osmtest_t * const p_osmt,
OUT ib_inform_info_t* p_ii) {
- cl_memclr(p_ii, sizeof(ib_inform_info_t));
+ memset(p_ii, 0, sizeof(ib_inform_info_t));
/* p_ii->lid_range_begin = cl_hton16(1); */
p_ii->lid_range_begin = 0xFFFF;
p_ii->lid_range_end = cl_hton16(p_osmt->max_lid);
@@ -709,7 +710,7 @@ osmt_init_inform_info_by_trap (IN osmtes
IN ib_net16_t trap_num,
OUT ib_inform_info_t* p_ii) {
- cl_memclr(p_ii, sizeof(ib_inform_info_t));
+ memset(p_ii, 0, sizeof(ib_inform_info_t));
/* p_ii->lid_range_begin = cl_hton16(1); */
p_ii->lid_range_begin = 0xFFFF;
p_ii->lid_range_end = cl_hton16(p_osmt->max_lid);
Index: osm/opensm/osm_lin_fwd_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_lin_fwd_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_lin_fwd_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_lft_rcv_ctrl_construct(
IN osm_lft_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_pkey_rcv.c
===================================================================
--- osm/opensm/osm_pkey_rcv.c (revision 7286)
+++ osm/opensm/osm_pkey_rcv.c (working copy)
@@ -62,7 +62,7 @@ void
osm_pkey_rcv_construct(
IN osm_pkey_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_sm_state_mgr.c
===================================================================
--- osm/opensm/osm_sm_state_mgr.c (revision 7286)
+++ osm/opensm/osm_sm_state_mgr.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -166,7 +166,7 @@ __osm_sm_state_mgr_send_local_port_info_
* Send a query of SubnGet(PortInfo) to our own port, in order to
* update the master_sm_base_lid of the subnet.
*/
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
p_port = ( osm_port_t * ) cl_qmap_get( &p_sm_mgr->p_subn->port_guid_tbl,
port_guid );
if( p_port ==
@@ -220,7 +220,7 @@ __osm_sm_state_mgr_send_master_sm_info_r
OSM_LOG_ENTER( p_sm_mgr->p_log,
__osm_sm_state_mgr_send_master_sm_info_req );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
if( p_sm_mgr->p_subn->sm_state == IB_SMINFO_STATE_STANDBY )
{
/*
@@ -395,7 +395,7 @@ void
osm_sm_state_mgr_construct(
IN osm_sm_state_mgr_t * const p_sm_mgr )
{
- cl_memclr( p_sm_mgr, sizeof( *p_sm_mgr ) );
+ memset( p_sm_mgr, 0, sizeof( *p_sm_mgr ) );
cl_spinlock_construct( &p_sm_mgr->state_lock );
cl_timer_construct( &p_sm_mgr->polling_timer );
}
Index: osm/opensm/osm_port.c
===================================================================
--- osm/opensm/osm_port.c (revision 7286)
+++ osm/opensm/osm_port.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -67,7 +67,7 @@ void
osm_physp_construct(
IN osm_physp_t* const p_physp )
{
- cl_memclr( p_physp, sizeof(*p_physp) );
+ memset( p_physp, 0, sizeof(*p_physp) );
osm_dr_path_construct( &p_physp->dr_path );
cl_ptr_vector_construct( &p_physp->slvl_by_port );
osm_pkey_tbl_construct( &p_physp->pkeys );
@@ -93,7 +93,7 @@ osm_physp_destroy(
/* free the P_Key Tables */
osm_pkey_tbl_destroy( &p_physp->pkeys );
- cl_memclr( p_physp, sizeof(*p_physp) );
+ memset( p_physp, 0, sizeof(*p_physp) );
osm_dr_path_construct( &p_physp->dr_path ); /* clear dr_path */
}
}
@@ -516,7 +516,8 @@ inline
uint64_t
__osm_ptr_to_key(void const *p) {
uint64_t k = 0;
- cl_memcpy(&k, p, sizeof(void *));
+
+ memcpy(&k, p, sizeof(void *));
return k;
}
@@ -524,7 +525,8 @@ inline
void *
__osm_key_to_ptr(uint64_t k) {
void *p = 0;
- cl_memcpy(&p, &k, sizeof(void *));
+
+ memcpy(&p, &k, sizeof(void *));
return p;
}
@@ -649,7 +651,7 @@ __osm_physp_update_new_dr_path(
__osm_ptr_to_key(p_physp) );
}
- cl_memclr( path_array, sizeof(path_array) );
+ memset( path_array, 0, sizeof(path_array) );
p_physp = (osm_physp_t*)cl_list_remove_head( &tmpPortsList );
while ( p_physp != NULL )
{
Index: osm/opensm/osm_sa_guidinfo_record.c
===================================================================
--- osm/opensm/osm_sa_guidinfo_record.c (revision 7286)
+++ osm/opensm/osm_sa_guidinfo_record.c (working copy)
@@ -93,7 +93,7 @@ void
osm_gir_rcv_construct(
IN osm_gir_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -177,7 +177,7 @@ __osm_gir_rcv_new_gir(
cl_ntoh16( match_lid ), block_num );
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
p_rec_item->rec.lid = match_lid;
p_rec_item->rec.block_num = block_num;
@@ -570,7 +570,7 @@ osm_gir_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_state_mgr.c
===================================================================
--- osm/opensm/osm_state_mgr.c (revision 7286)
+++ osm/opensm/osm_state_mgr.c (working copy)
@@ -79,7 +79,7 @@ void
osm_state_mgr_construct(
IN osm_state_mgr_t * const p_mgr )
{
- cl_memclr( p_mgr, sizeof( *p_mgr ) );
+ memset( p_mgr, 0, sizeof( *p_mgr ) );
cl_spinlock_construct( &p_mgr->state_lock );
cl_spinlock_construct( &p_mgr->idle_lock );
p_mgr->state = OSM_SM_STATE_INIT;
@@ -587,7 +587,7 @@ __osm_state_mgr_get_sw_info(
p_node = osm_switch_get_node_ptr( p_sw );
p_dr_path = osm_node_get_any_dr_path_ptr( p_node );
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
mad_context.si_context.node_guid = osm_node_get_node_guid( p_node );
mad_context.si_context.set_method = FALSE;
@@ -625,10 +625,10 @@ __osm_state_mgr_get_remote_port_info(
/* generate a dr path leaving on the physp to the remote node */
p_dr_path = osm_physp_get_dr_path_ptr( p_physp );
- cl_memcpy( &rem_node_dr_path, p_dr_path, sizeof( osm_dr_path_t ) );
+ memcpy( &rem_node_dr_path, p_dr_path, sizeof( osm_dr_path_t ) );
osm_dr_path_extend( &rem_node_dr_path, osm_physp_get_port_num( p_physp ) );
- cl_memclr( &mad_context, sizeof( mad_context ) );
+ memset( &mad_context, 0, sizeof( mad_context ) );
mad_context.pi_context.node_guid =
osm_node_get_node_guid( osm_physp_get_node_ptr( p_physp ) );
@@ -672,7 +672,7 @@ __osm_state_mgr_sweep_hop_0(
OSM_LOG_ENTER( p_mgr->p_log, __osm_state_mgr_sweep_hop_0 );
- cl_memclr( path_array, sizeof( path_array ) );
+ memset( path_array, 0, sizeof( path_array ) );
/*
* First, get the bind handle.
@@ -707,7 +707,7 @@ __osm_state_mgr_sweep_hop_0(
CL_PLOCK_RELEASE( p_mgr->p_lock );
- cl_memclr( &ni_context, sizeof( ni_context ) );
+ memset( &ni_context, 0, sizeof( ni_context ) );
osm_dr_path_init( &dr_path, h_bind, 0, path_array );
status = osm_req_get( p_mgr->p_req,
&dr_path,
@@ -933,7 +933,7 @@ __osm_state_mgr_sweep_hop_1(
CL_ASSERT( h_bind != OSM_BIND_INVALID_HANDLE );
- cl_memclr( path_array, sizeof( path_array ) );
+ memset( path_array, 0, sizeof( path_array ) );
/* the hop_1 operations depend on the type of our node.
* Currently - legal nodes that can host SM are SW and CA */
switch ( osm_node_get_type( p_node ) )
@@ -1029,7 +1029,7 @@ __osm_state_mgr_light_sweep_start(
p_sw_tbl = &p_mgr->p_subn->sw_guid_tbl;
- cl_memclr( path_array, sizeof( path_array ) );
+ memset( path_array, 0, sizeof( path_array ) );
/*
* First, get the bind handle.
@@ -1622,7 +1622,7 @@ __osm_state_mgr_send_handover(
* Send a query of SubnSet(SMInfo) HANDOVER to the remote sm given.
*/
- cl_memclr( &context, sizeof( context ) );
+ memset( &context, 0, sizeof( context ) );
p_port = p_sm->p_port;
if( p_port == NULL )
{
@@ -1722,8 +1722,8 @@ __osm_state_mgr_report_new_ports(
/* we need to provide the GID */
port_gid.unicast.prefix = p_mgr->p_subn->opt.subnet_prefix;
port_gid.unicast.interface_id = port_guid;
- cl_memcpy( &( notice.data_details.ntc_64_67.gid ),
- &( port_gid ), sizeof( ib_gid_t ) );
+ memcpy( &( notice.data_details.ntc_64_67.gid ),
+ &( port_gid ), sizeof( ib_gid_t ) );
/* According to page 653 - the issuer gid in this case of trap
* is the SM gid, since the SM is the initiator of this trap. */
Index: osm/opensm/osm_sa_vlarb_record.c
===================================================================
--- osm/opensm/osm_sa_vlarb_record.c (revision 7286)
+++ osm/opensm/osm_sa_vlarb_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -95,7 +95,7 @@ void
osm_vlarb_rec_rcv_construct(
IN osm_vlarb_rec_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -191,7 +191,7 @@ __osm_sa_vl_arb_create(
);
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.port_num = osm_physp_get_port_num( p_physp );
@@ -521,7 +521,7 @@ osm_vlarb_rec_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_sa_multipath_record.c
===================================================================
--- osm/opensm/osm_sa_multipath_record.c (revision 7286)
+++ osm/opensm/osm_sa_multipath_record.c (working copy)
@@ -98,7 +98,7 @@ void
osm_mpr_rcv_construct(
IN osm_mpr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pr_pool );
}
@@ -1350,7 +1350,7 @@ __osm_mpr_rcv_respond(
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method |= IB_MAD_METHOD_RESP_MASK;
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_subnet.c
===================================================================
--- osm/opensm/osm_subnet.c (revision 7286)
+++ osm/opensm/osm_subnet.c (working copy)
@@ -71,7 +71,7 @@ void
osm_subn_construct(
IN osm_subn_t* const p_subn )
{
- cl_memclr( p_subn, sizeof(*p_subn) );
+ memset( p_subn, 0, sizeof(*p_subn) );
cl_ptr_vector_construct( &p_subn->node_lid_tbl );
cl_ptr_vector_construct( &p_subn->port_lid_tbl );
cl_qmap_init( &p_subn->sw_guid_tbl );
@@ -415,7 +415,7 @@ void
osm_subn_set_default_opt(
IN osm_subn_opt_t* const p_opt )
{
- cl_memclr(p_opt, sizeof(osm_subn_opt_t));
+ memset(p_opt, 0, sizeof(osm_subn_opt_t));
p_opt->guid = 0;
p_opt->m_key = OSM_DEFAULT_M_KEY;
p_opt->sm_key = OSM_DEFAULT_SM_KEY;
Index: osm/opensm/osm_sa_sminfo_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_sminfo_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_sminfo_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_smir_ctrl_construct(
IN osm_smir_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sweep_fail_ctrl.c
===================================================================
--- osm/opensm/osm_sweep_fail_ctrl.c (revision 7286)
+++ osm/opensm/osm_sweep_fail_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -80,7 +80,7 @@ void
osm_sweep_fail_ctrl_construct(
IN osm_sweep_fail_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_matrix.c
===================================================================
--- osm/opensm/osm_matrix.c (revision 7286)
+++ osm/opensm/osm_matrix.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -72,7 +72,7 @@ __osm_lid_matrix_vec_init(
{
osm_lid_matrix_t* const p_lmx = (osm_lid_matrix_t*)context;
- cl_memset( p_elem, OSM_NO_PATH, p_lmx->num_ports + 1);
+ memset( p_elem, OSM_NO_PATH, p_lmx->num_ports + 1);
return( CL_SUCCESS );
}
@@ -88,7 +88,7 @@ __osm_lid_matrix_vec_clear(
osm_lid_matrix_t* const p_lmx = (osm_lid_matrix_t*)context;
UNUSED_PARAM( index );
- cl_memset( p_elem, OSM_NO_PATH, p_lmx->num_ports + 1);
+ memset( p_elem, OSM_NO_PATH, p_lmx->num_ports + 1);
}
/**********************************************************************
Index: osm/opensm/osm_trap_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_trap_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_trap_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_trap_rcv_ctrl_construct(
IN osm_trap_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_portinfo_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_portinfo_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_portinfo_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_pir_rcv_ctrl_construct(
IN osm_pir_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_service_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_service_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_service_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_sr_rcv_ctrl_construct(
IN osm_sr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_lft_record.c
===================================================================
--- osm/opensm/osm_sa_lft_record.c (revision 7286)
+++ osm/opensm/osm_sa_lft_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -89,7 +89,7 @@ void
osm_lftr_rcv_construct(
IN osm_lftr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -174,7 +174,7 @@ __osm_lftr_rcv_new_lftr(
);
}
- cl_memclr( &p_rec_item->rec, sizeof(ib_lft_record_t) );
+ memset( &p_rec_item->rec, 0, sizeof(ib_lft_record_t) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.block_num = block;
@@ -465,7 +465,7 @@ osm_lftr_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_pkey_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_pkey_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_pkey_rcv_ctrl.c (working copy)
@@ -65,7 +65,7 @@ void
osm_pkey_rcv_ctrl_construct(
IN osm_pkey_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_db_files.c
===================================================================
--- osm/opensm/osm_db_files.c (revision 7286)
+++ osm/opensm/osm_db_files.c (working copy)
@@ -126,7 +126,7 @@ void
osm_db_construct(
IN osm_db_t* const p_db )
{
- cl_memclr(p_db, sizeof(osm_db_t));
+ memset(p_db, 0, sizeof(osm_db_t));
cl_list_construct( &p_db->domains );
}
Index: osm/opensm/osm_resp.c
===================================================================
--- osm/opensm/osm_resp.c (revision 7286)
+++ osm/opensm/osm_resp.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -70,7 +70,7 @@ void
osm_resp_construct(
IN osm_resp_t* const p_resp )
{
- cl_memclr( p_resp, sizeof(*p_resp) );
+ memset( p_resp, 0, sizeof(*p_resp) );
}
/**********************************************************************
@@ -145,7 +145,7 @@ osm_resp_make_resp_smp(
p_dest_smp->dr_dlid = p_dest_smp->dr_slid;
p_dest_smp->dr_slid = p_dest_smp->dr_dlid;
- cl_memcpy( &p_dest_smp->data, p_payload, IB_SMP_DATA_SIZE );
+ memcpy( &p_dest_smp->data, p_payload, IB_SMP_DATA_SIZE );
Exit:
OSM_LOG_EXIT( p_resp->p_log );
Index: osm/opensm/osm_slvl_map_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_slvl_map_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_slvl_map_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_slvl_rcv_ctrl_construct(
IN osm_slvl_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_pkey_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_pkey_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_pkey_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -65,7 +65,7 @@ void
osm_pkey_rec_rcv_ctrl_construct(
IN osm_pkey_rec_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_helper.c
===================================================================
--- osm/opensm/osm_helper.c (revision 7286)
+++ osm/opensm/osm_helper.c (working copy)
@@ -963,7 +963,7 @@ osm_dump_multipath_record(
if( osm_log_is_active( p_log, log_level ) )
{
- cl_memclr(buf_line, sizeof(buf_line));
+ memset(buf_line, 0, sizeof(buf_line));
p_gid = p_mpr->gids;
if ( p_mpr->sgid_count )
{
Index: osm/opensm/osm_sa_service_record.c
===================================================================
--- osm/opensm/osm_sa_service_record.c (revision 7286)
+++ osm/opensm/osm_sa_service_record.c (working copy)
@@ -98,7 +98,7 @@ void
osm_sr_rcv_construct(
IN osm_sr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->sr_pool );
cl_timer_construct(&p_rcv->sr_timer );
}
@@ -399,7 +399,7 @@ __osm_sr_rcv_respond(
p_sa_mad = osm_madw_get_sa_mad_ptr( p_madw );
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
/* but what if it was a SET ? setting the response bit is not enough */
if (p_rcvd_mad->method == IB_MAD_METHOD_SET)
@@ -434,7 +434,7 @@ __osm_sr_rcv_respond(
(num_rec == 0))
{
p_resp_sa_mad->status = IB_SA_MAD_STATUS_NO_RECORDS;
- cl_memclr( p_resp_sr, sizeof(*p_resp_sr) );
+ memset( p_resp_sr, 0, sizeof(*p_resp_sr) );
}
else
{
@@ -461,7 +461,7 @@ __osm_sr_rcv_respond(
{
*p_resp_sr = p_sr_item->service_rec;
if (trusted_req == FALSE)
- cl_memclr(p_resp_sr->service_key, sizeof(p_resp_sr->service_key));
+ memset(p_resp_sr->service_key, 0, sizeof(p_resp_sr->service_key));
num_copied++;
}
@@ -510,9 +510,9 @@ __get_matching_sr(
if((comp_mask & IB_SR_COMPMASK_SGID) == IB_SR_COMPMASK_SGID)
{
if(
- cl_memcmp(&p_sr_item->p_service_rec->service_gid,
- &p_svcr->service_record.service_gid,
- sizeof(p_svcr->service_record.service_gid)) != 0)
+ memcmp(&p_sr_item->p_service_rec->service_gid,
+ &p_svcr->service_record.service_gid,
+ sizeof(p_svcr->service_record.service_gid)) != 0)
return;
}
if((comp_mask & IB_SR_COMPMASK_SPKEY) == IB_SR_COMPMASK_SPKEY )
@@ -524,17 +524,17 @@ __get_matching_sr(
if((comp_mask & IB_SR_COMPMASK_SKEY) == IB_SR_COMPMASK_SKEY)
{
- if(cl_memcmp(p_sr_item->p_service_rec->service_key ,
- p_svcr->service_record.service_key,
- 16*sizeof(uint8_t)))
+ if(memcmp(p_sr_item->p_service_rec->service_key ,
+ p_svcr->service_record.service_key,
+ 16*sizeof(uint8_t)))
return;
}
if((comp_mask & IB_SR_COMPMASK_SNAME) == IB_SR_COMPMASK_SNAME)
{
if(
- cl_memcmp(p_sr_item->p_service_rec->service_name,
- p_svcr->service_record.service_name,
- sizeof(p_svcr->service_record.service_name)) != 0
+ memcmp(p_sr_item->p_service_rec->service_name,
+ p_svcr->service_record.service_name,
+ sizeof(p_svcr->service_record.service_name)) != 0
)
return;
}
Index: osm/opensm/osm_sa_response.c
===================================================================
--- osm/opensm/osm_sa_response.c (revision 7286)
+++ osm/opensm/osm_sa_response.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -69,7 +69,7 @@ void
osm_sa_resp_construct(
IN osm_sa_resp_t* const p_resp )
{
- cl_memclr( p_resp, sizeof(*p_resp) );
+ memset( p_resp, 0, sizeof(*p_resp) );
}
/**********************************************************************
Index: osm/opensm/osm_sa_portinfo_record.c
===================================================================
--- osm/opensm/osm_sa_portinfo_record.c (revision 7286)
+++ osm/opensm/osm_sa_portinfo_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -93,7 +93,7 @@ void
osm_pir_rcv_construct(
IN osm_pir_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -176,7 +176,7 @@ __osm_pir_rcv_new_pir(
cl_ntoh16( lid ), osm_physp_get_port_num( p_physp ) );
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.port_info = *osm_physp_get_port_info_ptr( p_physp );
@@ -796,7 +796,7 @@ osm_pir_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_sa_slvl_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_slvl_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_slvl_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_slvl_rec_rcv_ctrl_construct(
IN osm_slvl_rec_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_req.c
===================================================================
--- osm/opensm/osm_req.c (revision 7286)
+++ osm/opensm/osm_req.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -76,7 +76,7 @@ osm_req_construct(
{
CL_ASSERT( p_req );
- cl_memclr( p_req, sizeof(*p_req) );
+ memset( p_req, 0, sizeof(*p_req) );
}
/**********************************************************************
@@ -289,8 +289,8 @@ osm_req_set(
if( p_context )
p_madw->context = *p_context;
- cl_memcpy( osm_madw_get_smp_ptr( p_madw )->data,
- p_payload, payload_size );
+ memcpy( osm_madw_get_smp_ptr( p_madw )->data,
+ p_payload, payload_size );
osm_vl15_post( p_req->p_vl15, p_madw );
Index: osm/opensm/osm_sa_pkey_record.c
===================================================================
--- osm/opensm/osm_sa_pkey_record.c (revision 7286)
+++ osm/opensm/osm_sa_pkey_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -83,7 +83,7 @@ void
osm_pkey_rec_rcv_construct(
IN osm_pkey_rec_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -179,7 +179,7 @@ __osm_sa_pkey_create(
);
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.block_num = block;
@@ -535,7 +535,7 @@ osm_pkey_rec_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_sminfo_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_sminfo_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_sminfo_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_sminfo_rcv_ctrl_construct(
IN osm_sminfo_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_lft_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_lft_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_lft_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_lftr_rcv_ctrl_construct(
IN osm_lftr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_inform.c
===================================================================
--- osm/opensm/osm_inform.c (revision 7286)
+++ osm/opensm/osm_inform.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_infr_construct(
IN osm_infr_t* const p_infr )
{
- cl_memclr( p_infr, sizeof(osm_infr_t) );
+ memset( p_infr, 0, sizeof(osm_infr_t) );
}
/**********************************************************************
**********************************************************************/
@@ -97,7 +97,7 @@ osm_infr_init(
/* what else do we need in the inform_record ??? */
/* copy the contents of the provided informinfo */
- cl_memcpy(p_infr,p_infr_rec, sizeof(osm_infr_t));
+ memcpy(p_infr,p_infr_rec, sizeof(osm_infr_t));
}
@@ -134,7 +134,7 @@ __match_rid_of_inf_rec(
osm_infr_t* p_infr = (osm_infr_t*)p_list_item;
int32_t count;
- count = cl_memcmp(
+ count = memcmp(
&p_infr->inform_record,
p_infr_rec,
sizeof(p_infr_rec->subscriber_gid) +
@@ -209,13 +209,13 @@ __match_inf_rec(
int32_t count1, count2;
OSM_LOG_ENTER( p_log, __match_inf_rec);
- count1 = cl_memcmp(&p_infr->report_addr, &p_infr_rec->report_addr,
- sizeof(p_infr_rec->report_addr));
+ count1 = memcmp(&p_infr->report_addr, &p_infr_rec->report_addr,
+ sizeof(p_infr_rec->report_addr));
if (count1)
osm_log(p_log, OSM_LOG_DEBUG,
"__match_inf_rec : "
"Differ by Address\n");
- count2 = cl_memcmp(
+ count2 = memcmp(
&p_infr->inform_record.inform_info,
&p_infr_rec->inform_record.inform_info,
sizeof(p_infr->inform_record.inform_info));
@@ -457,7 +457,7 @@ __match_notice_to_inf_rec(
if (p_ii->gid.unicast.prefix != 0 || p_ii->gid.unicast.interface_id != 0 )
{
/* macth by GID */
- if (cl_memcmp(&(p_ii->gid), &(p_ntc->issuer_gid), sizeof(ib_gid_t)))
+ if (memcmp(&(p_ii->gid), &(p_ntc->issuer_gid), sizeof(ib_gid_t)))
{
osm_log(p_log, OSM_LOG_DEBUG,
"__match_notice_to_inf_rec: "
Index: osm/opensm/osm_lin_fwd_rcv.c
===================================================================
--- osm/opensm/osm_lin_fwd_rcv.c (revision 7286)
+++ osm/opensm/osm_lin_fwd_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -66,7 +66,7 @@ void
osm_lft_rcv_construct(
IN osm_lft_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_service.c
===================================================================
--- osm/opensm/osm_service.c (revision 7286)
+++ osm/opensm/osm_service.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -60,7 +60,7 @@ void
osm_svcr_construct(
IN osm_svcr_t* const p_svcr )
{
- cl_memclr( p_svcr, sizeof(*p_svcr) );
+ memset( p_svcr, 0, sizeof(*p_svcr) );
}
/**********************************************************************
@@ -124,7 +124,7 @@ __match_rid_of_svc_rec(
osm_svcr_t* p_svcr = (osm_svcr_t*)p_list_item;
int32_t count;
- count = cl_memcmp(
+ count = memcmp(
&p_svcr->service_record,
p_svc_rec,
sizeof(p_svc_rec->service_id) +
Index: osm/opensm/osm_sa_slvl_record.c
===================================================================
--- osm/opensm/osm_sa_slvl_record.c (revision 7286)
+++ osm/opensm/osm_sa_slvl_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -95,7 +95,7 @@ void
osm_slvl_rec_rcv_construct(
IN osm_slvl_rec_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -191,7 +191,7 @@ __osm_sa_slvl_create(
);
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.out_port_num = osm_physp_get_port_num( p_physp );
@@ -499,7 +499,7 @@ osm_slvl_rec_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_switch.c
===================================================================
--- osm/opensm/osm_switch.c (revision 7286)
+++ osm/opensm/osm_switch.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -64,7 +64,7 @@ osm_switch_construct(
IN osm_switch_t* const p_sw )
{
CL_ASSERT( p_sw );
- cl_memclr( p_sw, sizeof(*p_sw) );
+ memset( p_sw, 0, sizeof(*p_sw) );
osm_lid_matrix_construct( &p_sw->lmx );
}
@@ -193,7 +193,7 @@ osm_switch_get_fwd_tbl_block(
if( base_lid_ho <= max_lid_ho )
{
- cl_memclr( p_block, IB_SMP_DATA_SIZE );
+ memset( p_block, 0, IB_SMP_DATA_SIZE );
/*
Determine the range of LIDs we can return with this block.
*/
@@ -376,9 +376,9 @@ osm_switch_recommend_path(
/* Is the sys guid already used ? */
sys_used = FALSE;
for (i = 0; !sys_used && (i < *p_num_used_sys); i++)
- if (!cl_memcmp(&p_rem_node->node_info.sys_guid,
- &remote_sys_guids[i],
- sizeof(uint64_t)))
+ if (!memcmp(&p_rem_node->node_info.sys_guid,
+ &remote_sys_guids[i],
+ sizeof(uint64_t)))
sys_used = TRUE;
/* If not update the least hops for this case */
@@ -396,9 +396,9 @@ osm_switch_recommend_path(
/* Else Is the node guid already used ? */
node_used = FALSE;
for (i = 0; !node_used && (i < *p_num_used_nodes); i++)
- if (!cl_memcmp(&p_rem_node->node_info.node_guid,
- &remote_node_guids[i],
- sizeof(uint64_t)))
+ if (!memcmp(&p_rem_node->node_info.node_guid,
+ &remote_node_guids[i],
+ sizeof(uint64_t)))
node_used = TRUE;
@@ -448,13 +448,13 @@ osm_switch_recommend_path(
p_physp = osm_node_get_physp_ptr(p_sw->p_node, best_port);
p_rem_physp = osm_physp_get_remote(p_physp);
p_rem_node = osm_physp_get_node_ptr(p_rem_physp);
- cl_memcpy(&remote_node_guids[*p_num_used_nodes],
- &(p_rem_node->node_info.node_guid),
- sizeof(uint64_t));
+ memcpy(&remote_node_guids[*p_num_used_nodes],
+ &(p_rem_node->node_info.node_guid),
+ sizeof(uint64_t));
(*p_num_used_nodes)++;
- cl_memcpy(&remote_sys_guids[*p_num_used_sys],
- &(p_rem_node->node_info.sys_guid),
- sizeof(uint64_t));
+ memcpy(&remote_sys_guids[*p_num_used_sys],
+ &(p_rem_node->node_info.sys_guid),
+ sizeof(uint64_t));
(*p_num_used_sys)++;
}
Index: osm/opensm/osm_opensm.c
===================================================================
--- osm/opensm/osm_opensm.c (revision 7286)
+++ osm/opensm/osm_opensm.c (working copy)
@@ -74,7 +74,7 @@ void
osm_opensm_construct(
IN osm_opensm_t * const p_osm )
{
- cl_memclr( p_osm, sizeof( *p_osm ) );
+ memset( p_osm, 0, sizeof( *p_osm ) );
osm_subn_construct( &p_osm->subn );
osm_sm_construct( &p_osm->sm );
osm_sa_construct( &p_osm->sa );
Index: osm/opensm/osm_sa.c
===================================================================
--- osm/opensm/osm_sa.c (revision 7286)
+++ osm/opensm/osm_sa.c (working copy)
@@ -76,7 +76,7 @@ void
osm_sa_construct(
IN osm_sa_t* const p_sa )
{
- cl_memclr( p_sa, sizeof(*p_sa) );
+ memset( p_sa, 0, sizeof(*p_sa) );
p_sa->state = OSM_SA_STATE_INIT;
p_sa->sa_trans_id = OSM_SA_INITIAL_TID_VALUE;
Index: osm/opensm/osm_vl_arb_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_vl_arb_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_vl_arb_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_vla_rcv_ctrl_construct(
IN osm_vla_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sminfo_rcv.c
===================================================================
--- osm/opensm/osm_sminfo_rcv.c (revision 7286)
+++ osm/opensm/osm_sminfo_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -71,7 +71,7 @@ void
osm_sminfo_rcv_construct(
IN osm_sminfo_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
@@ -157,7 +157,7 @@ __osm_sminfo_rcv_process_get_request(
/*
No real need to grab the lock for this function.
*/
- cl_memclr( payload, sizeof( payload ) );
+ memset( payload, 0, sizeof( payload ) );
p_smp = osm_madw_get_smp_ptr( p_madw );
@@ -263,7 +263,7 @@ __osm_sminfo_rcv_process_set_request(
/*
No real need to grab the lock for this function.
*/
- cl_memclr( payload, sizeof( payload ) );
+ memset( payload, 0, sizeof( payload ) );
/* get the lock */
CL_PLOCK_EXCL_ACQUIRE( p_rcv->p_lock );
Index: osm/opensm/osm_multicast.c
===================================================================
--- osm/opensm/osm_multicast.c (revision 7286)
+++ osm/opensm/osm_multicast.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -81,7 +81,7 @@ void
osm_mgrp_construct(
IN osm_mgrp_t* const p_mgrp )
{
- cl_memclr( p_mgrp, sizeof(*p_mgrp) );
+ memset( p_mgrp, 0, sizeof(*p_mgrp) );
cl_qmap_init( &p_mgrp->mcm_port_tbl );
}
@@ -332,9 +332,9 @@ osm_mgrp_send_delete_notice(
notice.issuer_lid = p_subn->sm_base_lid;
/* following o14-12.1.11 and table 120 p726 */
/* we need to provide the MGID */
- cl_memcpy(&(notice.data_details.ntc_64_67.gid),
- &(p_mgrp->mcmember_rec.mgid),
- sizeof(ib_gid_t));
+ memcpy(&(notice.data_details.ntc_64_67.gid),
+ &(p_mgrp->mcmember_rec.mgid),
+ sizeof(ib_gid_t));
/* According to page 653 - the issuer gid in this case of trap
is the SM gid, since the SM is the initiator of this trap. */
@@ -379,9 +379,9 @@ osm_mgrp_send_create_notice(
notice.issuer_lid = p_subn->sm_base_lid;
/* following o14-12.1.11 and table 120 p726 */
/* we need to provide the MGID */
- cl_memcpy(&(notice.data_details.ntc_64_67.gid),
- &(p_mgrp->mcmember_rec.mgid),
- sizeof(ib_gid_t));
+ memcpy(&(notice.data_details.ntc_64_67.gid),
+ &(p_mgrp->mcmember_rec.mgid),
+ sizeof(ib_gid_t));
/* According to page 653 - the issuer gid in this case of trap
is the SM gid, since the SM is the initiator of this trap. */
Index: osm/opensm/osm_sa_class_port_info.c
===================================================================
--- osm/opensm/osm_sa_class_port_info.c (revision 7286)
+++ osm/opensm/osm_sa_class_port_info.c (working copy)
@@ -83,7 +83,7 @@ void
osm_cpi_rcv_construct(
IN osm_cpi_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
@@ -140,7 +140,7 @@ __osm_cpi_rcv_respond(
OSM_LOG_ENTER( p_rcv->p_log, __osm_cpi_rcv_respond );
- cl_memclr(&zero_gid, sizeof(ib_gid_t));
+ memset(&zero_gid, 0, sizeof(ib_gid_t));
/*
Get a MAD to reply. Address of Mad is in the received mad_wrapper
@@ -160,7 +160,7 @@ __osm_cpi_rcv_respond(
p_sa_mad = osm_madw_get_sa_mad_ptr( p_madw );
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method |= IB_MAD_METHOD_RESP_MASK;
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_node_info_rcv.c
===================================================================
--- osm/opensm/osm_node_info_rcv.c (revision 7286)
+++ osm/opensm/osm_node_info_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -978,7 +978,7 @@ void
osm_ni_rcv_construct(
IN osm_ni_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_sa_vlarb_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_vlarb_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_vlarb_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_vlarb_rec_rcv_ctrl_construct(
IN osm_vlarb_rec_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_mcast_mgr.c
===================================================================
--- osm/opensm/osm_mcast_mgr.c (revision 7286)
+++ osm/opensm/osm_mcast_mgr.c (working copy)
@@ -385,7 +385,7 @@ void
osm_mcast_mgr_construct(
IN osm_mcast_mgr_t* const p_mgr )
{
- cl_memclr( p_mgr, sizeof(*p_mgr) );
+ memset( p_mgr, 0, sizeof(*p_mgr) );
}
/**********************************************************************
@@ -1636,7 +1636,7 @@ osm_mcast_mgr_process_mgrp_cb(
OSM_LOG_ENTER( p_mgr->p_log, osm_mcast_mgr_process_mgrp_cb );
/* nice copy no warning on size diff */
- cl_memcpy(&mlid, &p_ctxt->mlid, sizeof(mlid));
+ memcpy(&mlid, &p_ctxt->mlid, sizeof(mlid));
/* we can destroy the context now */
cl_free(p_ctxt);
Index: osm/opensm/osm_sa_sminfo_record.c
===================================================================
--- osm/opensm/osm_sa_sminfo_record.c (revision 7286)
+++ osm/opensm/osm_sa_sminfo_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -80,7 +80,7 @@ void
osm_smir_rcv_construct(
IN osm_smir_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
@@ -228,7 +228,7 @@ osm_smir_rcv_process(
p_sa_mad = osm_madw_get_sa_mad_ptr( p_madw );
/* Copy the MAD header back into the response mad */
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* Fill in the offset (paylen will be done by the rmpp SAR) */
p_resp_sa_mad->attr_offset =
Index: osm/opensm/osm_sa_informinfo_ctrl.c
===================================================================
--- osm/opensm/osm_sa_informinfo_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_informinfo_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_infr_rcv_ctrl_construct(
IN osm_infr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sm.c
===================================================================
--- osm/opensm/osm_sm.c (revision 7286)
+++ osm/opensm/osm_sm.c (working copy)
@@ -135,7 +135,7 @@ void
osm_sm_construct(
IN osm_sm_t * const p_sm )
{
- cl_memclr( p_sm, sizeof( *p_sm ) );
+ memset( p_sm, 0, sizeof( *p_sm ) );
p_sm->thread_state = OSM_THREAD_STATE_NONE;
p_sm->sm_trans_id = OSM_SM_INITIAL_TID_VALUE;
cl_event_construct( &p_sm->signal );
@@ -596,7 +596,7 @@ __osm_sm_mgrp_connect(
*/
ctx2 =
( osm_mcast_mgr_ctxt_t * ) cl_malloc( sizeof( osm_mcast_mgr_ctxt_t ) );
- cl_memcpy( &ctx2->mlid, &p_mgrp->mlid, sizeof( p_mgrp->mlid ) );
+ memcpy( &ctx2->mlid, &p_mgrp->mlid, sizeof( p_mgrp->mlid ) );
ctx2->req_type = req_type;
ctx2->port_guid = port_guid;
@@ -629,7 +629,7 @@ __osm_sm_mgrp_disconnect(
*/
ctx2 =
( osm_mcast_mgr_ctxt_t * ) cl_malloc( sizeof( osm_mcast_mgr_ctxt_t ) );
- cl_memcpy( &ctx2->mlid, &p_mgrp->mlid, sizeof( p_mgrp->mlid ) );
+ memcpy( &ctx2->mlid, &p_mgrp->mlid, sizeof( p_mgrp->mlid ) );
ctx2->req_type = OSM_MCAST_REQ_TYPE_LEAVE;
ctx2->port_guid = port_guid;
Index: osm/opensm/osm_trap_rcv.c
===================================================================
--- osm/opensm/osm_trap_rcv.c (revision 7286)
+++ osm/opensm/osm_trap_rcv.c (working copy)
@@ -178,7 +178,7 @@ void
osm_trap_rcv_construct(
IN osm_trap_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_event_wheel_construct( &p_rcv->trap_aging_tracker );
}
@@ -344,8 +344,8 @@ __osm_trap_rcv_process_request(
/*
No real need to grab the lock for this function.
*/
- cl_memclr( payload, sizeof( payload ) );
- cl_memclr( &tmp_madw, sizeof( tmp_madw ));
+ memset( payload, 0, sizeof( payload ) );
+ memset( &tmp_madw, 0, sizeof( tmp_madw ));
p_smp = osm_madw_get_smp_ptr( p_madw );
@@ -364,8 +364,8 @@ __osm_trap_rcv_process_request(
* payload.
*/
- cl_memcpy(payload, &(p_smp->data), IB_SMP_DATA_SIZE);
- cl_memcpy(&tmp_madw, p_madw, sizeof( tmp_madw ));
+ memcpy(payload, &(p_smp->data), IB_SMP_DATA_SIZE);
+ memcpy(&tmp_madw, p_madw, sizeof( tmp_madw ));
if (is_gsi == FALSE)
{
@@ -606,9 +606,9 @@ __osm_trap_rcv_process_request(
{
if (tmp_madw.mad_addr.addr_type.gsi.global_route)
{
- cl_memcpy(&(p_ntci->issuer_gid),
- &(tmp_madw.mad_addr.addr_type.gsi.grh_info.src_gid),
- sizeof(ib_gid_t));
+ memcpy(&(p_ntci->issuer_gid),
+ &(tmp_madw.mad_addr.addr_type.gsi.grh_info.src_gid),
+ sizeof(ib_gid_t));
}
else
{
Index: osm/opensm/osm_lin_fwd_tbl.c
===================================================================
--- osm/opensm/osm_lin_fwd_tbl.c (revision 7286)
+++ osm/opensm/osm_lin_fwd_tbl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -83,7 +83,7 @@ osm_lin_tbl_new(
/*
Initialize the table to OSM_NO_PATH, which means "invalid port"
*/
- cl_memset( p_tbl, OSM_NO_PATH, __osm_lin_tbl_compute_obj_size( size ) );
+ memset( p_tbl, OSM_NO_PATH, __osm_lin_tbl_compute_obj_size( size ) );
if( p_tbl != NULL )
{
p_tbl->size = (uint16_t)size;
Index: osm/opensm/osm_prtn.c
===================================================================
--- osm/opensm/osm_prtn.c (revision 7286)
+++ osm/opensm/osm_prtn.c (working copy)
@@ -206,10 +206,10 @@ ib_api_status_t osm_prtn_add_mcgroup(osm
pkey = cl_hton16(cl_ntoh16(p->pkey) | 0x8000);
- cl_memclr(&mc_rec, sizeof(mc_rec));
+ memset(&mc_rec, 0, sizeof(mc_rec));
mc_rec.mgid = osm_ipoib_mgid; /* this is ipv4 broadcast */
- cl_memcpy(&mc_rec.mgid.raw[4], &pkey, sizeof(pkey));
+ memcpy(&mc_rec.mgid.raw[4], &pkey, sizeof(pkey));
mc_rec.qkey = CL_HTON32(0x0b1b);
mc_rec.mtu = mtu ? mtu : 4; /* 2048 Bytes */
@@ -235,7 +235,7 @@ ib_api_status_t osm_prtn_add_mcgroup(osm
/* workaround for TS */ /* FIXME: remove this upon TS fixes */
mc_rec.mgid = osm_ts_ipoib_mgid;
- cl_memcpy(&mc_rec.mgid.raw[4], &pkey, sizeof(pkey));
+ memcpy(&mc_rec.mgid.raw[4], &pkey, sizeof(pkey));
status = osm_mcmr_rcv_find_or_create_new_mgrp(&p_sa->mcmr_rcv,
comp_mask, &mc_rec, &p_mgrp);
if (p_mgrp)
Index: osm/opensm/osm_ucast_mgr.c
===================================================================
--- osm/opensm/osm_ucast_mgr.c (revision 7286)
+++ osm/opensm/osm_ucast_mgr.c (working copy)
@@ -81,7 +81,7 @@ void
osm_ucast_mgr_construct(
IN osm_ucast_mgr_t* const p_mgr )
{
- cl_memclr( p_mgr, sizeof(*p_mgr) );
+ memset( p_mgr, 0, sizeof(*p_mgr) );
}
/**********************************************************************
Index: osm/opensm/osm_sa_informinfo.c
===================================================================
--- osm/opensm/osm_sa_informinfo.c (revision 7286)
+++ osm/opensm/osm_sa_informinfo.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -74,7 +74,7 @@ void
osm_infr_rcv_construct(
IN osm_infr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
@@ -147,8 +147,8 @@ __validate_ports_access_rights(
p_rcv->p_subn,
&p_infr_rec->report_addr );
- cl_memclr( &zero_gid, sizeof(zero_gid) );
- if ( cl_memcmp (&(p_infr_rec->inform_record.inform_info.gid),
+ memset( &zero_gid, 0, sizeof(zero_gid) );
+ if ( memcmp (&(p_infr_rec->inform_record.inform_info.gid),
&zero_gid, sizeof(ib_gid_t) ) )
{
/* a gid is defined */
@@ -305,7 +305,7 @@ __osm_infr_rcv_respond(
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
/* copy the request InformInfo */
- cl_memcpy( p_resp_sa_mad, p_sa_mad, MAD_BLOCK_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, MAD_BLOCK_SIZE );
p_resp_sa_mad->method = IB_MAD_METHOD_GET_RESP;
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_remote_sm.c
===================================================================
--- osm/opensm/osm_remote_sm.c (revision 7286)
+++ osm/opensm/osm_remote_sm.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -64,7 +64,7 @@ void
osm_remote_sm_construct(
IN osm_remote_sm_t* const p_sm )
{
- cl_memclr( p_sm, sizeof(*p_sm) );
+ memset( p_sm, 0, sizeof(*p_sm) );
}
/**********************************************************************
@@ -73,7 +73,7 @@ void
osm_remote_sm_destroy(
IN osm_remote_sm_t* const p_sm )
{
- cl_memclr( p_sm, sizeof(*p_sm) );
+ memset( p_sm, 0, sizeof(*p_sm) );
}
/**********************************************************************
Index: osm/opensm/osm_mad_pool.c
===================================================================
--- osm/opensm/osm_mad_pool.c (revision 7286)
+++ osm/opensm/osm_mad_pool.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -86,7 +86,7 @@ osm_mad_pool_construct(
{
CL_ASSERT( p_pool );
- cl_memclr( p_pool, sizeof(*p_pool) );
+ memset( p_pool, 0, sizeof(*p_pool) );
cl_qlock_pool_construct( &p_pool->madw_pool );
}
Index: osm/opensm/osm_sa_mcmember_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_mcmember_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_mcmember_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -79,7 +79,7 @@ void
osm_mcmr_rcv_ctrl_construct(
IN osm_mcmr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_node_info_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_node_info_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_node_info_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_ni_rcv_ctrl_construct(
IN osm_ni_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_link_mgr.c
===================================================================
--- osm/opensm/osm_link_mgr.c (revision 7286)
+++ osm/opensm/osm_link_mgr.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -66,7 +66,7 @@ void
osm_link_mgr_construct(
IN osm_link_mgr_t* const p_mgr )
{
- cl_memclr( p_mgr, sizeof(*p_mgr) );
+ memset( p_mgr, 0, sizeof(*p_mgr) );
}
/**********************************************************************
@@ -180,10 +180,10 @@ osm_link_mgr_set_physp_pi(
p_node = osm_physp_get_node_ptr( p_physp );
p_old_pi = osm_physp_get_port_info_ptr( p_physp );
- cl_memclr( payload, IB_SMP_DATA_SIZE );
+ memset( payload, 0, IB_SMP_DATA_SIZE );
/* Correction by FUJITSU */
- cl_memcpy( payload, p_old_pi, sizeof(ib_port_info_t) );
+ memcpy( payload, p_old_pi, sizeof(ib_port_info_t) );
/*
Correction following a bug injected by the previous
@@ -211,32 +211,32 @@ osm_link_mgr_set_physp_pi(
port_num == 0 )
{
p_pi->m_key = p_mgr->p_subn->opt.m_key;
- if (cl_memcmp( &p_pi->m_key, &p_old_pi->m_key, sizeof(p_pi->m_key) ))
+ if (memcmp( &p_pi->m_key, &p_old_pi->m_key, sizeof(p_pi->m_key) ))
send_set = TRUE;
p_pi->subnet_prefix = p_mgr->p_subn->opt.subnet_prefix;
- if (cl_memcmp( &p_pi->subnet_prefix, &p_old_pi->subnet_prefix,
- sizeof(p_pi->subnet_prefix) ))
+ if (memcmp( &p_pi->subnet_prefix, &p_old_pi->subnet_prefix,
+ sizeof(p_pi->subnet_prefix) ))
send_set = TRUE;
p_pi->base_lid = osm_physp_get_base_lid( p_physp );
- if (cl_memcmp( &p_pi->base_lid, &p_old_pi->base_lid,
- sizeof(p_pi->base_lid) ))
+ if (memcmp( &p_pi->base_lid, &p_old_pi->base_lid,
+ sizeof(p_pi->base_lid) ))
send_set = TRUE;
/* we are initializing the ports with our local sm_base_lid */
p_pi->master_sm_base_lid = p_mgr->p_subn->sm_base_lid;
- if (cl_memcmp( &p_pi->master_sm_base_lid, &p_old_pi->master_sm_base_lid,
- sizeof(p_pi->master_sm_base_lid) ))
+ if (memcmp( &p_pi->master_sm_base_lid, &p_old_pi->master_sm_base_lid,
+ sizeof(p_pi->master_sm_base_lid) ))
send_set = TRUE;
p_pi->m_key_lease_period = p_mgr->p_subn->opt.m_key_lease_period;
- if (cl_memcmp( &p_pi->m_key_lease_period, &p_old_pi->m_key_lease_period,
- sizeof(p_pi->m_key_lease_period) ))
+ if (memcmp( &p_pi->m_key_lease_period, &p_old_pi->m_key_lease_period,
+ sizeof(p_pi->m_key_lease_period) ))
send_set = TRUE;
p_pi->mkey_lmc = p_mgr->p_subn->opt.lmc;
- if (cl_memcmp( &p_pi->mkey_lmc, &p_old_pi->mkey_lmc, sizeof(p_pi->mkey_lmc) ))
+ if (memcmp( &p_pi->mkey_lmc, &p_old_pi->mkey_lmc, sizeof(p_pi->mkey_lmc) ))
send_set = TRUE;
ib_port_info_set_timeout( p_pi, p_mgr->p_subn->opt.subnet_timeout );
@@ -274,8 +274,8 @@ osm_link_mgr_set_physp_pi(
p_pi,
p_mgr->p_subn->opt.local_phy_errors_threshold,
p_mgr->p_subn->opt.overrun_errors_threshold);
- if (cl_memcmp( &p_pi->error_threshold, &p_old_pi->error_threshold,
- sizeof(p_pi->error_threshold) ))
+ if (memcmp( &p_pi->error_threshold, &p_old_pi->error_threshold,
+ sizeof(p_pi->error_threshold) ))
send_set = TRUE;
/*
@@ -283,8 +283,8 @@ osm_link_mgr_set_physp_pi(
then determine the neighbor MTU.
*/
p_pi->link_width_enabled = p_old_pi->link_width_supported;
- if (cl_memcmp( &p_pi->link_width_enabled, &p_old_pi->link_width_enabled,
- sizeof(p_pi->link_width_enabled) ))
+ if (memcmp( &p_pi->link_width_enabled, &p_old_pi->link_width_enabled,
+ sizeof(p_pi->link_width_enabled) ))
send_set = TRUE;
/* calc new op_vls and mtu */
Index: osm/opensm/osm_mcast_fwd_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_mcast_fwd_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_mcast_fwd_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_mft_rcv_ctrl_construct(
IN osm_mft_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_node_record.c
===================================================================
--- osm/opensm/osm_sa_node_record.c (revision 7286)
+++ osm/opensm/osm_sa_node_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -86,7 +86,7 @@ void
osm_nr_rcv_construct(
IN osm_nr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -171,14 +171,14 @@ __osm_nr_rcv_new_nr(
);
}
- cl_memclr( &p_rec_item->rec, sizeof(ib_node_record_t) );
+ memset( &p_rec_item->rec, 0, sizeof(ib_node_record_t) );
p_rec_item->rec.lid = lid;
p_rec_item->rec.node_info = p_node->node_info;
p_rec_item->rec.node_info.port_guid = port_guid;
- cl_memcpy(&(p_rec_item->rec.node_desc), &(p_node->node_desc),
- IB_NODE_DESCRIPTION_SIZE);
+ memcpy(&(p_rec_item->rec.node_desc), &(p_node->node_desc),
+ IB_NODE_DESCRIPTION_SIZE);
cl_qlist_insert_tail( p_list, (cl_list_item_t*)&p_rec_item->pool_item );
Exit:
@@ -572,7 +572,7 @@ osm_nr_rcv_process(
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_mcast_tbl.c
===================================================================
--- osm/opensm/osm_mcast_tbl.c (revision 7286)
+++ osm/opensm/osm_mcast_tbl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -68,7 +68,7 @@ osm_mcast_tbl_init(
CL_ASSERT( p_tbl );
CL_ASSERT( num_ports );
- cl_memclr( p_tbl, sizeof(*p_tbl) );
+ memset( p_tbl, 0, sizeof(*p_tbl) );
p_tbl->max_block_in_use = -1;
@@ -285,7 +285,7 @@ osm_mcast_tbl_get_block(
/*
Caller shouldn't do this for efficiency's sake...
*/
- cl_memclr( p_block, IB_SMP_DATA_SIZE );
+ memset( p_block, 0, IB_SMP_DATA_SIZE );
return( TRUE );
}
Index: osm/opensm/osm_sa_mad_ctrl.c
===================================================================
--- osm/opensm/osm_sa_mad_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_mad_ctrl.c (working copy)
@@ -499,7 +499,7 @@ osm_sa_mad_ctrl_construct(
IN osm_sa_mad_ctrl_t* const p_ctrl )
{
CL_ASSERT( p_ctrl );
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_pkey.c
===================================================================
--- osm/opensm/osm_pkey.c (revision 7286)
+++ osm/opensm/osm_pkey.c (working copy)
@@ -124,7 +124,7 @@ void osm_pkey_tbl_sync_new_blocks(
break;
cl_ptr_vector_set(&((osm_pkey_tbl_t *)p_pkey_tbl)->new_blocks, b, p_new_block);
}
- cl_memcpy(p_new_block, p_block, sizeof(*p_new_block));
+ memcpy(p_new_block, p_block, sizeof(*p_new_block));
}
}
@@ -154,7 +154,7 @@ int osm_pkey_tbl_set(
}
/* sets the block values */
- cl_memcpy( p_pkey_block, p_tbl, sizeof(ib_pkey_table_t) );
+ memcpy( p_pkey_block, p_tbl, sizeof(ib_pkey_table_t) );
/*
NOTE: as the spec does not require uniqueness of PKeys in
Index: osm/opensm/osm_req_ctrl.c
===================================================================
--- osm/opensm/osm_req_ctrl.c (revision 7286)
+++ osm/opensm/osm_req_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -86,7 +86,7 @@ void
osm_req_ctrl_construct(
IN osm_req_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_multipath_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_multipath_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_multipath_record_ctrl.c (working copy)
@@ -78,7 +78,7 @@ void
osm_mpr_rcv_ctrl_construct(
IN osm_mpr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_link_record.c
===================================================================
--- osm/opensm/osm_sa_link_record.c (revision 7286)
+++ osm/opensm/osm_sa_link_record.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -82,7 +82,7 @@ void
osm_lr_rcv_construct(
IN osm_lr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->lr_pool );
}
@@ -669,7 +669,7 @@ __osm_lr_rcv_respond(
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
/* Copy the header from the request to response */
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method |= IB_MAD_METHOD_RESP_MASK;
p_resp_sa_mad->attr_offset =
ib_get_attr_offset( sizeof(ib_link_record_t) );
@@ -695,7 +695,7 @@ __osm_lr_rcv_respond(
if ((p_rcvd_mad->method == IB_MAD_METHOD_GET) && (num_rec == 0))
{
p_resp_sa_mad->status = IB_SA_MAD_STATUS_NO_RECORDS;
- cl_memclr( p_resp_lr, sizeof(*p_resp_lr) );
+ memset( p_resp_lr, 0, sizeof(*p_resp_lr) );
}
else
{
Index: osm/opensm/osm_sw_info_rcv.c
===================================================================
--- osm/opensm/osm_sw_info_rcv.c (revision 7286)
+++ osm/opensm/osm_sw_info_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -535,7 +535,7 @@ void
osm_si_rcv_construct(
IN osm_si_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_mcm_port.c
===================================================================
--- osm/opensm/osm_mcm_port.c (revision 7286)
+++ osm/opensm/osm_mcm_port.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -59,7 +59,7 @@ void
osm_mcm_port_construct(
IN osm_mcm_port_t* const p_mcm )
{
- cl_memclr( p_mcm, sizeof(*p_mcm) );
+ memset( p_mcm, 0, sizeof(*p_mcm) );
}
/**********************************************************************
Index: osm/opensm/osm_mcast_fwd_rcv.c
===================================================================
--- osm/opensm/osm_mcast_fwd_rcv.c (revision 7286)
+++ osm/opensm/osm_mcast_fwd_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -68,7 +68,7 @@ void
osm_mft_rcv_construct(
IN osm_mft_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_node_desc_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_node_desc_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_node_desc_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_nd_rcv_ctrl_construct(
IN osm_nd_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sm_mad_ctrl.c
===================================================================
--- osm/opensm/osm_sm_mad_ctrl.c (revision 7286)
+++ osm/opensm/osm_sm_mad_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -927,7 +927,7 @@ osm_sm_mad_ctrl_construct(
IN osm_sm_mad_ctrl_t* const p_ctrl )
{
CL_ASSERT( p_ctrl );
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_slvl_map_rcv.c
===================================================================
--- osm/opensm/osm_slvl_map_rcv.c (revision 7286)
+++ osm/opensm/osm_slvl_map_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -74,7 +74,7 @@ void
osm_slvl_rcv_construct(
IN osm_slvl_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_sa_node_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_node_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_node_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_nr_rcv_ctrl_construct(
IN osm_nr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_class_port_info_ctrl.c
===================================================================
--- osm/opensm/osm_sa_class_port_info_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_class_port_info_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_cpi_rcv_ctrl_construct(
IN osm_cpi_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_port_info_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_port_info_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_port_info_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_pi_rcv_ctrl_construct(
IN osm_pi_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_node_desc_rcv.c
===================================================================
--- osm/opensm/osm_node_desc_rcv.c (revision 7286)
+++ osm/opensm/osm_node_desc_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -79,7 +79,7 @@ __osm_nd_rcv_process_nd(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_VERBOSE ) )
{
- cl_memcpy( desc, p_nd, sizeof(*p_nd) );
+ memcpy( desc, p_nd, sizeof(*p_nd) );
/* Guarantee null termination before printing. */
desc[IB_NODE_DESCRIPTION_SIZE] = '\0';
@@ -89,7 +89,7 @@ __osm_nd_rcv_process_nd(
cl_ntoh64( osm_node_get_node_guid( p_node )), desc );
}
- cl_memcpy( &p_node->node_desc.description, p_nd, sizeof(*p_nd) );
+ memcpy( &p_node->node_desc.description, p_nd, sizeof(*p_nd) );
OSM_LOG_EXIT( p_rcv->p_log );
}
@@ -100,7 +100,7 @@ void
osm_nd_rcv_construct(
IN osm_nd_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_sa_path_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_path_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_path_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_pr_rcv_ctrl_construct(
IN osm_pr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sw_info_rcv_ctrl.c
===================================================================
--- osm/opensm/osm_sw_info_rcv_ctrl.c (revision 7286)
+++ osm/opensm/osm_sw_info_rcv_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_si_rcv_ctrl_construct(
IN osm_si_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_link_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_link_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_link_record_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -73,7 +73,7 @@ void
osm_lr_rcv_ctrl_construct(
IN osm_lr_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_qos.c
===================================================================
--- osm/opensm/osm_qos.c (revision 7286)
+++ osm/opensm/osm_qos.c (working copy)
@@ -88,14 +88,14 @@ static ib_api_status_t vlarb_update_tabl
vl_mask = (1 << (ib_port_info_get_op_vls(p_pi) - 1)) - 1;
- cl_memset(&block, 0, sizeof(block));
- cl_memcpy(&block, table_block,
- block_length * sizeof(block.vl_entry[0]));
+ memset(&block, 0, sizeof(block));
+ memcpy(&block, table_block,
+ block_length * sizeof(block.vl_entry[0]));
for (i = 0; i < block_length; i++)
block.vl_entry[i].vl &= vl_mask;
- if (!cl_memcmp(&p->vl_arb[block_num], &block,
- block_length * sizeof(block.vl_entry[0])))
+ if (!memcmp(&p->vl_arb[block_num], &block,
+ block_length * sizeof(block.vl_entry[0])))
return IB_SUCCESS;
context.vla_context.node_guid =
@@ -185,7 +185,7 @@ static ib_api_status_t sl2vl_update_tabl
}
p_tbl = osm_physp_get_slvl_tbl(p, in_port);
- if (p_tbl && !cl_memcmp(p_tbl, &tbl, sizeof(tbl)))
+ if (p_tbl && !memcmp(p_tbl, &tbl, sizeof(tbl)))
return IB_SUCCESS;
context.slvl_context.node_guid = osm_node_get_node_guid(p_node);
@@ -243,8 +243,8 @@ static ib_api_status_t vl_high_limit_upd
if (p_pi->vl_high_limit == qcfg->vl_high_limit)
return IB_SUCCESS;
- cl_memclr(payload, IB_SMP_DATA_SIZE);
- cl_memcpy(payload, p_pi, sizeof(ib_port_info_t));
+ memset(payload, 0, IB_SMP_DATA_SIZE);
+ memcpy(payload, p_pi, sizeof(ib_port_info_t));
p_pi = (ib_port_info_t *) payload;
p_pi->state_info2 = 0;
Index: osm/opensm/osm_sa_mcmember_record.c
===================================================================
--- osm/opensm/osm_sa_mcmember_record.c (revision 7286)
+++ osm/opensm/osm_sa_mcmember_record.c (working copy)
@@ -100,7 +100,7 @@ void
osm_mcmr_rcv_construct(
IN osm_mcmr_recv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pool );
}
@@ -191,9 +191,9 @@ __search_mgrp_by_mgid(
/* compare entire MGID so different scope will not sneak in for
the same MGID */
- if (cl_memcmp(&p_mgrp->mcmember_rec.mgid,
- &p_recvd_mcmember_rec->mgid,
- sizeof(ib_gid_t)))
+ if (memcmp(&p_mgrp->mcmember_rec.mgid,
+ &p_recvd_mcmember_rec->mgid,
+ sizeof(ib_gid_t)))
return;
if(p_ctxt->p_mgrp)
@@ -440,8 +440,8 @@ __add_new_mgrp_port(
p_rcv->p_subn,
p_mad_addr );
- if (! cl_memcmp(&p_recvd_mcmember_rec->port_gid, &requester_gid,
- sizeof(ib_gid_t)))
+ if (!memcmp(&p_recvd_mcmember_rec->port_gid, &requester_gid,
+ sizeof(ib_gid_t)))
{
proxy_join = FALSE;
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
@@ -524,7 +524,7 @@ __osm_mcmr_rcv_respond(
p_resp_sa_mad = (ib_sa_mad_t*)p_resp_madw->p_mad;
p_sa_mad = (ib_sa_mad_t*)p_madw->p_mad;
/* Copy the MAD header back into the response mad */
- cl_memcpy(p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE);
+ memcpy(p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE);
/* based on the current method decide about the response: */
if ((p_resp_sa_mad->method == IB_MAD_METHOD_GET) ||
(p_resp_sa_mad->method == IB_MAD_METHOD_SET)) {
@@ -776,7 +776,7 @@ __validate_modify(IN osm_mcmr_recv_t* co
p_rcv->p_subn,
p_mad_addr );
- if (cl_memcmp(&((*pp_mcm_port)->port_gid), &request_gid, sizeof(ib_gid_t)))
+ if (memcmp(&((*pp_mcm_port)->port_gid), &request_gid, sizeof(ib_gid_t)))
{
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__validate_modify: "
@@ -959,7 +959,7 @@ __validate_requested_mgid(IN osm_mcmr_re
}
/* the MGID signature can mark IPoIB or SA assigned MGIDs */
- cl_memcpy(&signature, &(p_mcm_rec->mgid.multicast.raw_group_id), sizeof(signature));
+ memcpy(&signature, &(p_mcm_rec->mgid.multicast.raw_group_id), sizeof(signature));
signature = cl_ntoh16(signature);
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__validate_requested_mgid: "
@@ -1268,12 +1268,12 @@ osm_mcmr_rcv_create_new_mgrp(
p_mgid->raw[3] = 0x1B;
/* HACK: I will be using the SA port gid for making it globally unique */
- cl_memcpy((&p_mgid->raw[4]),
- &p_rcv->p_subn->opt.subnet_prefix, sizeof(uint64_t));
+ memcpy((&p_mgid->raw[4]),
+ &p_rcv->p_subn->opt.subnet_prefix, sizeof(uint64_t));
/* HACK how do we get a unique number - use the mlid twice */
- cl_memcpy(&p_mgid->raw[10], &mlid, sizeof(uint16_t));
- cl_memcpy(&p_mgid->raw[12], &mlid, sizeof(uint16_t));
+ memcpy(&p_mgid->raw[10], &mlid, sizeof(uint16_t));
+ memcpy(&p_mgid->raw[12], &mlid, sizeof(uint16_t));
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"osm_mcmr_rcv_create_new_mgrp: "
"Allocated new MGID:0x%016" PRIx64 " : "
@@ -1841,7 +1841,7 @@ __osm_mcmr_rcv_new_mcmr(
goto Exit;
}
- cl_memclr( &p_rec_item->rec, sizeof( p_rec_item->rec ) );
+ memset( &p_rec_item->rec, 0, sizeof( p_rec_item->rec ) );
/* HACK: Not trusted requesters should result with 0 Join
State, Port Guid, and Proxy */
@@ -1899,17 +1899,17 @@ __osm_sa_mcm_by_comp_mask_cb(
/* first try to eliminate the group by MGID, MLID, or P_Key */
if ((IB_MCR_COMPMASK_MGID & comp_mask) &&
- cl_memcmp(&p_rcvd_rec->mgid, &p_mgrp->mcmember_rec.mgid, sizeof(ib_gid_t)))
+ memcmp(&p_rcvd_rec->mgid, &p_mgrp->mcmember_rec.mgid, sizeof(ib_gid_t)))
goto Exit;
if ((IB_MCR_COMPMASK_MLID & comp_mask) &&
- cl_memcmp(&p_rcvd_rec->mlid, &p_mgrp->mcmember_rec.mlid, sizeof(uint16_t)))
+ memcmp(&p_rcvd_rec->mlid, &p_mgrp->mcmember_rec.mlid, sizeof(uint16_t)))
goto Exit;
/* if the requester physical port doesn't have the pkey that is defined for
the group - exit. */
- if (! osm_physp_has_pkey( p_rcv->p_log, p_mgrp->mcmember_rec.pkey,
- p_req_physp ))
+ if (!osm_physp_has_pkey( p_rcv->p_log, p_mgrp->mcmember_rec.pkey,
+ p_req_physp ))
goto Exit;
/* now do the rest of the match */
@@ -1975,7 +1975,7 @@ __osm_sa_mcm_by_comp_mask_cb(
if (osm_mgrp_is_port_present(p_mgrp, portguid, &p_mcm_port))
{
scope_state = p_mcm_port->scope_state;
- cl_memcpy(&port_gid, &(p_mcm_port->port_gid), sizeof(ib_gid_t));
+ memcpy(&port_gid, &(p_mcm_port->port_gid), sizeof(ib_gid_t));
proxy_join = p_mcm_port->proxy_join;
}
else
@@ -2009,7 +2009,7 @@ __osm_sa_mcm_by_comp_mask_cb(
/* add to the list */
match_rec = p_mgrp->mcmember_rec;
match_rec.scope_state = p_mcm_port->scope_state;
- cl_memcpy( &(match_rec.port_gid), &(p_mcm_port->port_gid),
+ memcpy( &(match_rec.port_gid), &(p_mcm_port->port_gid),
sizeof(ib_gid_t));
osm_log(p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_mcm_by_comp_mask_cb: "
@@ -2037,7 +2037,7 @@ __osm_sa_mcm_by_comp_mask_cb(
/* add to the list */
match_rec = p_mgrp->mcmember_rec;
match_rec.scope_state = scope_state;
- cl_memcpy(&(match_rec.port_gid), &port_gid, sizeof(ib_gid_t));
+ memcpy(&(match_rec.port_gid), &port_gid, sizeof(ib_gid_t));
match_rec.proxy_join = (uint8_t)proxy_join;
__osm_mcmr_rcv_new_mcmr(p_rcv, &match_rec, p_ctxt->p_list);
@@ -2203,7 +2203,7 @@ osm_mcmr_query_mgrp(IN osm_mcmr_recv_t*
Then copy all records from the list into the response payload.
*/
- cl_memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_rcvd_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method = (uint8_t)(p_resp_sa_mad->method | 0x80);
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
@@ -2245,7 +2245,7 @@ osm_mcmr_query_mgrp(IN osm_mcmr_recv_t*
*p_resp_rec = p_rec_item->rec;
if (trusted_req == FALSE)
{
- cl_memclr(&p_resp_rec->port_gid, sizeof(ib_gid_t));
+ memset(&p_resp_rec->port_gid, 0, sizeof(ib_gid_t));
ib_member_set_join_state(p_resp_rec, 0);
p_resp_rec->proxy_join = 0;
}
Index: osm/opensm/osm_vl15intf.c
===================================================================
--- osm/opensm/osm_vl15intf.c (revision 7286)
+++ osm/opensm/osm_vl15intf.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -282,7 +282,7 @@ void
osm_vl15_construct(
IN osm_vl15_t* const p_vl )
{
- cl_memclr( p_vl, sizeof(*p_vl) );
+ memset( p_vl, 0, sizeof(*p_vl) );
p_vl->state = OSM_VL15_STATE_INIT;
p_vl->thread_state = OSM_THREAD_STATE_NONE;
cl_event_construct( &p_vl->signal );
Index: osm/opensm/osm_port_info_rcv.c
===================================================================
--- osm/opensm/osm_port_info_rcv.c (revision 7286)
+++ osm/opensm/osm_port_info_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -198,7 +198,7 @@ __osm_pi_rcv_process_endport(
This port indicates it's an SM and it's not our own port.
Acquire the SMInfo Attribute.
*/
- cl_memclr( &context, sizeof(context) );
+ memset( &context, 0, sizeof(context) );
context.smi_context.set_method = FALSE;
status = osm_req_get( p_rcv->p_req,
osm_physp_get_dr_path_ptr( p_physp ),
@@ -530,7 +530,7 @@ void
osm_pi_rcv_construct(
IN osm_pi_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
Index: osm/opensm/osm_drop_mgr.c
===================================================================
--- osm/opensm/osm_drop_mgr.c (revision 7286)
+++ osm/opensm/osm_drop_mgr.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -72,7 +72,7 @@ osm_drop_mgr_construct(
IN osm_drop_mgr_t* const p_mgr )
{
CL_ASSERT( p_mgr );
- cl_memclr( p_mgr, sizeof(*p_mgr) );
+ memset( p_mgr, 0, sizeof(*p_mgr) );
}
/**********************************************************************
@@ -322,9 +322,9 @@ __osm_drop_mgr_remove_port(
/* we need to provide the GID */
port_gid.unicast.prefix = p_mgr->p_subn->opt.subnet_prefix;
port_gid.unicast.interface_id = port_guid;
- cl_memcpy(&(notice.data_details.ntc_64_67.gid),
- &(port_gid),
- sizeof(ib_gid_t));
+ memcpy(&(notice.data_details.ntc_64_67.gid),
+ &(port_gid),
+ sizeof(ib_gid_t));
/* According to page 653 - the issuer gid in this case of trap
is the SM gid, since the SM is the initiator of this trap. */
Index: osm/opensm/osm_state_mgr_ctrl.c
===================================================================
--- osm/opensm/osm_state_mgr_ctrl.c (revision 7286)
+++ osm/opensm/osm_state_mgr_ctrl.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -77,7 +77,7 @@ void
osm_state_mgr_ctrl_construct(
IN osm_state_mgr_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_guidinfo_record_ctrl.c
===================================================================
--- osm/opensm/osm_sa_guidinfo_record_ctrl.c (revision 7286)
+++ osm/opensm/osm_sa_guidinfo_record_ctrl.c (working copy)
@@ -76,7 +76,7 @@ void
osm_gir_rcv_ctrl_construct(
IN osm_gir_rcv_ctrl_t* const p_ctrl )
{
- cl_memclr( p_ctrl, sizeof(*p_ctrl) );
+ memset( p_ctrl, 0, sizeof(*p_ctrl) );
p_ctrl->h_disp = CL_DISP_INVALID_HANDLE;
}
Index: osm/opensm/osm_sa_path_record.c
===================================================================
--- osm/opensm/osm_sa_path_record.c (revision 7286)
+++ osm/opensm/osm_sa_path_record.c (working copy)
@@ -102,7 +102,7 @@ void
osm_pr_rcv_construct(
IN osm_pr_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
cl_qlock_pool_construct( &p_rcv->pr_pool );
}
@@ -1245,9 +1245,9 @@ __search_mgrp_by_mgid(
/* compare entire MGID so different scope will not sneak in for
the same MGID */
- if ( cl_memcmp( &p_mgrp->mcmember_rec.mgid,
- p_recvd_mgid,
- sizeof(ib_gid_t) ) )
+ if ( memcmp( &p_mgrp->mcmember_rec.mgid,
+ p_recvd_mgid,
+ sizeof(ib_gid_t) ) )
return;
#if 0
@@ -1591,7 +1591,7 @@ __osm_pr_rcv_respond(
p_sa_mad = osm_madw_get_sa_mad_ptr( p_madw );
p_resp_sa_mad = osm_madw_get_sa_mad_ptr( p_resp_madw );
- cl_memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
+ memcpy( p_resp_sa_mad, p_sa_mad, IB_SA_MAD_HDR_SIZE );
p_resp_sa_mad->method |= IB_MAD_METHOD_RESP_MASK;
/* C15-0.1.5 - always return SM_Key = 0 (table 185 p 884) */
p_resp_sa_mad->sm_key = 0;
Index: osm/opensm/osm_lid_mgr.c
===================================================================
--- osm/opensm/osm_lid_mgr.c (revision 7286)
+++ osm/opensm/osm_lid_mgr.c (working copy)
@@ -118,7 +118,7 @@ void
osm_lid_mgr_construct(
IN osm_lid_mgr_t* const p_mgr )
{
- cl_memclr( p_mgr, sizeof(*p_mgr) );
+ memset( p_mgr, 0, sizeof(*p_mgr) );
cl_ptr_vector_construct( &p_mgr->used_lids );
}
@@ -1008,12 +1008,12 @@ __osm_lid_mgr_set_physp_pi(
Third, send the SMP to this physical port.
*/
- cl_memclr( payload, IB_SMP_DATA_SIZE );
+ memset( payload, 0, IB_SMP_DATA_SIZE );
/* Correction by FUJITSU */
if( port_num != 0 )
{
- cl_memcpy( payload, p_old_pi, sizeof(ib_port_info_t) );
+ memcpy( payload, p_old_pi, sizeof(ib_port_info_t) );
}
/*
@@ -1047,36 +1047,36 @@ __osm_lid_mgr_set_physp_pi(
p_pi->m_key = p_mgr->p_subn->opt.m_key;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->m_key, &p_old_pi->m_key, sizeof(p_pi->m_key) ))
+ if (memcmp( &p_pi->m_key, &p_old_pi->m_key, sizeof(p_pi->m_key) ))
send_set = TRUE;
p_pi->subnet_prefix = p_mgr->p_subn->opt.subnet_prefix;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->subnet_prefix, &p_old_pi->subnet_prefix,
- sizeof(p_pi->subnet_prefix) ))
+ if (memcmp( &p_pi->subnet_prefix, &p_old_pi->subnet_prefix,
+ sizeof(p_pi->subnet_prefix) ))
send_set = TRUE;
p_pi->base_lid = lid;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->base_lid, &p_old_pi->base_lid,
- sizeof(p_pi->base_lid) ))
+ if (memcmp( &p_pi->base_lid, &p_old_pi->base_lid,
+ sizeof(p_pi->base_lid) ))
send_set = TRUE;
/* we are updating the ports with our local sm_base_lid */
p_pi->master_sm_base_lid = p_mgr->p_subn->sm_base_lid;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->master_sm_base_lid, &p_old_pi->master_sm_base_lid,
- sizeof(p_pi->master_sm_base_lid) ))
+ if (memcmp( &p_pi->master_sm_base_lid, &p_old_pi->master_sm_base_lid,
+ sizeof(p_pi->master_sm_base_lid) ))
send_set = TRUE;
p_pi->m_key_lease_period = p_mgr->p_subn->opt.m_key_lease_period;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->m_key_lease_period, &p_old_pi->m_key_lease_period,
- sizeof(p_pi->m_key_lease_period) ))
+ if (memcmp( &p_pi->m_key_lease_period, &p_old_pi->m_key_lease_period,
+ sizeof(p_pi->m_key_lease_period) ))
send_set = TRUE;
/*
@@ -1099,15 +1099,15 @@ __osm_lid_mgr_set_physp_pi(
p_pi->link_width_enabled = p_old_pi->link_width_supported;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->link_width_enabled, &p_old_pi->link_width_enabled,
- sizeof(p_pi->link_width_enabled) ))
+ if (memcmp( &p_pi->link_width_enabled, &p_old_pi->link_width_enabled,
+ sizeof(p_pi->link_width_enabled) ))
send_set = TRUE;
/* M_KeyProtectBits are always zero */
p_pi->mkey_lmc = p_mgr->p_subn->opt.lmc;
/* Check to see if the value we are setting is different than
the value in the port_info. If it is, turn on send_set flag */
- if (cl_memcmp( &p_pi->mkey_lmc, &p_old_pi->mkey_lmc, sizeof(p_pi->mkey_lmc) ))
+ if (memcmp( &p_pi->mkey_lmc, &p_old_pi->mkey_lmc, sizeof(p_pi->mkey_lmc) ))
send_set = TRUE;
/* calc new op_vls and mtu */
@@ -1134,8 +1134,8 @@ __osm_lid_mgr_set_physp_pi(
p_mgr->p_subn->opt.local_phy_errors_threshold,
p_mgr->p_subn->opt.overrun_errors_threshold);
- if (cl_memcmp( &p_pi->error_threshold, &p_old_pi->error_threshold,
- sizeof(p_pi->error_threshold) ))
+ if (memcmp( &p_pi->error_threshold, &p_old_pi->error_threshold,
+ sizeof(p_pi->error_threshold) ))
send_set = TRUE;
/*
Index: osm/opensm/osm_pkey_mgr.c
===================================================================
--- osm/opensm/osm_pkey_mgr.c (revision 7286)
+++ osm/opensm/osm_pkey_mgr.c (working copy)
@@ -102,8 +102,8 @@ pkey_mgr_enforce_partition(
if ((p_pi->vl_enforce & 0xc) == (0xc)*(enforce == TRUE))
return IB_SUCCESS;
- cl_memclr( payload, IB_SMP_DATA_SIZE );
- cl_memcpy( payload, p_pi, sizeof(ib_port_info_t) );
+ memset( payload, 0, IB_SMP_DATA_SIZE );
+ memcpy( payload, p_pi, sizeof(ib_port_info_t) );
p_pi = (ib_port_info_t*)payload;
if (enforce == TRUE)
@@ -263,7 +263,7 @@ pkey_mgr_update_peer_port(
{
block = osm_pkey_tbl_new_block_get( p_pkey_tbl, block_index );
peer_block = osm_pkey_tbl_block_get( p_peer_pkey_tbl, block_index );
- if ( cl_memcmp( peer_block, block, sizeof( *peer_block ) ) )
+ if ( memcmp( peer_block, block, sizeof( *peer_block ) ) )
{
status = pkey_mgr_update_pkey_entry( p_req, peer, block, block_index );
if ( status == IB_SUCCESS )
@@ -322,7 +322,7 @@ static boolean_t pkey_mgr_update_port(
block = osm_pkey_tbl_block_get( p_pkey_tbl, block_index );
new_block = osm_pkey_tbl_new_block_get( p_pkey_tbl, block_index );
- if (!new_block || !cl_memcmp( new_block, block, sizeof( *block ) ) )
+ if (!new_block || !memcmp( new_block, block, sizeof( *block ) ) )
continue;
status = pkey_mgr_update_pkey_entry( p_req, p, new_block, block_index );
Index: osm/opensm/osm_vl_arb_rcv.c
===================================================================
--- osm/opensm/osm_vl_arb_rcv.c (revision 7286)
+++ osm/opensm/osm_vl_arb_rcv.c (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire, Inc. All rights reserved.
* Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
* Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
*
@@ -74,7 +74,7 @@ void
osm_vla_rcv_construct(
IN osm_vla_rcv_t* const p_rcv )
{
- cl_memclr( p_rcv, sizeof(*p_rcv) );
+ memset( p_rcv, 0, sizeof(*p_rcv) );
}
/**********************************************************************
More information about the general
mailing list