Mostly a cleanup patch. Make all previous patch's routing callback
functions take a void * instead of osm_opensm_t * for consistency to
other routing callbacks.
Al
--
Albert Chu
[EMAIL PROTECTED]
925-422-5311
Computer Scientist
High Performance Systems Division
Lawrence Livermore National Laboratory
>From c4a31ebe122584674b1fef1eafa80410ebc1c8cf Mon Sep 17 00:00:00 2001
From: Albert Chu <[EMAIL PROTECTED]>
Date: Fri, 12 Sep 2008 14:22:10 -0700
Subject: [PATCH] all build_lid_matrices and build_fwd_tables takes void *
Signed-off-by: Albert Chu <[EMAIL PROTECTED]>
---
opensm/include/opensm/osm_ucast_minhop.h | 8 ++++----
opensm/opensm/osm_ucast_dor.c | 3 ++-
opensm/opensm/osm_ucast_minhop.c | 6 ++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/opensm/include/opensm/osm_ucast_minhop.h b/opensm/include/opensm/osm_ucast_minhop.h
index 839a271..3e4464e 100644
--- a/opensm/include/opensm/osm_ucast_minhop.h
+++ b/opensm/include/opensm/osm_ucast_minhop.h
@@ -58,10 +58,10 @@ BEGIN_C_DECLS
*
* SYNOPSIS
*/
-int osm_ucast_minhop_build_lid_matrices(IN osm_opensm_t * const p_osm);
+int osm_ucast_minhop_build_lid_matrices(IN void *context);
/*
* PARAMETERS
-* p_osm
+* context
* [in] Pointer to an osm_opensm_t object.
*
* NOTES
@@ -105,10 +105,10 @@ int osm_ucast_minhop_and_dor_build_fwd_tables(IN osm_opensm_t * const p_osm,
*
* SYNOPSIS
*/
-int osm_ucast_minhop_build_fwd_tables(IN osm_opensm_t * const p_osm);
+int osm_ucast_minhop_build_fwd_tables(IN void *context);
/*
* PARAMETERS
-* p_osm
+* context
* [in] Pointer to an osm_opensm_t object.
*
* NOTES
diff --git a/opensm/opensm/osm_ucast_dor.c b/opensm/opensm/osm_ucast_dor.c
index dfa6d29..9432a05 100644
--- a/opensm/opensm/osm_ucast_dor.c
+++ b/opensm/opensm/osm_ucast_dor.c
@@ -41,8 +41,9 @@
#include <opensm/osm_ucast_minhop.h>
#include <opensm/osm_log.h>
-int osm_ucast_dor_build_fwd_tables(osm_opensm_t * const p_osm)
+int osm_ucast_dor_build_fwd_tables(void *context)
{
+ osm_opensm_t *p_osm = context;
return osm_ucast_minhop_and_dor_build_fwd_tables(p_osm, TRUE, TRUE);
}
diff --git a/opensm/opensm/osm_ucast_minhop.c b/opensm/opensm/osm_ucast_minhop.c
index 1dcf615..c0d2412 100644
--- a/opensm/opensm/osm_ucast_minhop.c
+++ b/opensm/opensm/osm_ucast_minhop.c
@@ -444,11 +444,12 @@ __osm_ucast_minhop_process_neighbors(IN cl_map_item_t * const p_map_item,
/**********************************************************************
**********************************************************************/
-int osm_ucast_minhop_build_lid_matrices(IN osm_opensm_t * const p_osm)
+int osm_ucast_minhop_build_lid_matrices(void *context)
{
uint32_t i;
uint32_t iteration_max;
cl_qmap_t *p_sw_guid_tbl;
+ osm_opensm_t *p_osm = context;
struct osm_minhop_build_lid_matrices_data minhop_lid_data;
p_sw_guid_tbl = &p_osm->subn.sw_guid_tbl;
@@ -652,8 +653,9 @@ int osm_ucast_minhop_and_dor_build_fwd_tables(osm_opensm_t * const p_osm,
return 0;
}
-int osm_ucast_minhop_build_fwd_tables(osm_opensm_t * const p_osm)
+int osm_ucast_minhop_build_fwd_tables(void *context)
{
+ osm_opensm_t *p_osm = context;
return osm_ucast_minhop_and_dor_build_fwd_tables(p_osm, TRUE, FALSE);
}
--
1.5.4.5
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
