add osm_ucast_lash.h, osm_ucast_updn.h, osm_ucast_file.h, and
osm_ucast_ftree.h for consistency.
Al
--
Albert Chu
[EMAIL PROTECTED]
925-422-5311
Computer Scientist
High Performance Systems Division
Lawrence Livermore National Laboratory
>From f588c688d22687e7a0ac7d7a2d07237cfcb0b11c Mon Sep 17 00:00:00 2001
From: Albert Chu <[EMAIL PROTECTED]>
Date: Fri, 12 Sep 2008 14:19:16 -0700
Subject: [PATCH] add routing header files for consistency
Signed-off-by: Albert Chu <[EMAIL PROTECTED]>
---
opensm/include/opensm/osm_ucast_file.h | 70 +++++++++++++++++++++++++++++++
opensm/include/opensm/osm_ucast_ftree.h | 70 +++++++++++++++++++++++++++++++
opensm/include/opensm/osm_ucast_lash.h | 70 +++++++++++++++++++++++++++++++
opensm/include/opensm/osm_ucast_updn.h | 70 +++++++++++++++++++++++++++++++
opensm/opensm/Makefile.am | 4 ++
opensm/opensm/osm_opensm.c | 9 ++--
6 files changed, 288 insertions(+), 5 deletions(-)
create mode 100644 opensm/include/opensm/osm_ucast_file.h
create mode 100644 opensm/include/opensm/osm_ucast_ftree.h
create mode 100644 opensm/include/opensm/osm_ucast_lash.h
create mode 100644 opensm/include/opensm/osm_ucast_updn.h
diff --git a/opensm/include/opensm/osm_ucast_file.h b/opensm/include/opensm/osm_ucast_file.h
new file mode 100644
index 0000000..ccc02a7
--- /dev/null
+++ b/opensm/include/opensm/osm_ucast_file.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2008 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _OSM_UCAST_FILE_H_
+#define _OSM_UCAST_FILE_H_
+
+#include <opensm/osm_opensm.h>
+#include <opensm/osm_ucast_mgr.h>
+
+#ifdef __cplusplus
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else /* !__cplusplus */
+# define BEGIN_C_DECLS
+# define END_C_DECLS
+#endif /* __cplusplus */
+
+BEGIN_C_DECLS
+
+/****f* OpenSM: Unicast File/osm_ucast_file_setup
+* NAME
+* osm_ucast_file_setup
+*
+* DESCRIPTION
+* Setup routing engine with file routing.
+*
+* SYNOPSIS
+*/
+int osm_ucast_file_setup(IN osm_opensm_t * p_osm);
+/*
+* PARAMETERS
+* p_mgr
+* [in] Pointer to an osm_opensm_t object.
+*
+*********/
+
+END_C_DECLS
+#endif /* _OSM_UCAST_FILE_H_ */
diff --git a/opensm/include/opensm/osm_ucast_ftree.h b/opensm/include/opensm/osm_ucast_ftree.h
new file mode 100644
index 0000000..b2cf0e5
--- /dev/null
+++ b/opensm/include/opensm/osm_ucast_ftree.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2008 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _OSM_UCAST_FTREE_H_
+#define _OSM_UCAST_FTREE_H_
+
+#include <opensm/osm_opensm.h>
+#include <opensm/osm_ucast_mgr.h>
+
+#ifdef __cplusplus
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else /* !__cplusplus */
+# define BEGIN_C_DECLS
+# define END_C_DECLS
+#endif /* __cplusplus */
+
+BEGIN_C_DECLS
+
+/****f* OpenSM: Unicast Ftree/osm_ucast_ftree_setup
+* NAME
+* osm_ucast_ftree_setup
+*
+* DESCRIPTION
+* Setup routing engine with ftree routing.
+*
+* SYNOPSIS
+*/
+int osm_ucast_ftree_setup(IN osm_opensm_t * p_osm);
+/*
+* PARAMETERS
+* p_mgr
+* [in] Pointer to an osm_opensm_t object.
+*
+*********/
+
+END_C_DECLS
+#endif /* _OSM_UCAST_FTREE_H_ */
diff --git a/opensm/include/opensm/osm_ucast_lash.h b/opensm/include/opensm/osm_ucast_lash.h
new file mode 100644
index 0000000..93adbf0
--- /dev/null
+++ b/opensm/include/opensm/osm_ucast_lash.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2008 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _OSM_UCAST_LASH_H_
+#define _OSM_UCAST_LASH_H_
+
+#include <opensm/osm_opensm.h>
+#include <opensm/osm_ucast_mgr.h>
+
+#ifdef __cplusplus
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else /* !__cplusplus */
+# define BEGIN_C_DECLS
+# define END_C_DECLS
+#endif /* __cplusplus */
+
+BEGIN_C_DECLS
+
+/****f* OpenSM: Unicast Lash/osm_ucast_lash_setup
+* NAME
+* osm_ucast_lash_setup
+*
+* DESCRIPTION
+* Setup routing engine with lash routing.
+*
+* SYNOPSIS
+*/
+int osm_ucast_lash_setup(IN osm_opensm_t * p_osm);
+/*
+* PARAMETERS
+* p_mgr
+* [in] Pointer to an osm_opensm_t object.
+*
+*********/
+
+END_C_DECLS
+#endif /* _OSM_UCAST_LASH_H_ */
diff --git a/opensm/include/opensm/osm_ucast_updn.h b/opensm/include/opensm/osm_ucast_updn.h
new file mode 100644
index 0000000..cd537a0
--- /dev/null
+++ b/opensm/include/opensm/osm_ucast_updn.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2004-2008 Voltaire, Inc. All rights reserved.
+ * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved.
+ * Copyright (c) 1996-2003 Intel Corporation. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef _OSM_UCAST_UPDN_H_
+#define _OSM_UCAST_UPDN_H_
+
+#include <opensm/osm_opensm.h>
+#include <opensm/osm_ucast_mgr.h>
+
+#ifdef __cplusplus
+# define BEGIN_C_DECLS extern "C" {
+# define END_C_DECLS }
+#else /* !__cplusplus */
+# define BEGIN_C_DECLS
+# define END_C_DECLS
+#endif /* __cplusplus */
+
+BEGIN_C_DECLS
+
+/****f* OpenSM: Unicast Updn/osm_ucast_updn_setup
+* NAME
+* osm_ucast_updn_setup
+*
+* DESCRIPTION
+* Setup routing engine with updn routing.
+*
+* SYNOPSIS
+*/
+int osm_ucast_updn_setup(IN osm_opensm_t * p_osm);
+/*
+* PARAMETERS
+* p_mgr
+* [in] Pointer to an osm_opensm_t object.
+*
+*********/
+
+END_C_DECLS
+#endif /* _OSM_UCAST_UPDN_H_ */
diff --git a/opensm/opensm/Makefile.am b/opensm/opensm/Makefile.am
index ade35d2..ea44e14 100644
--- a/opensm/opensm/Makefile.am
+++ b/opensm/opensm/Makefile.am
@@ -115,7 +115,11 @@ opensminclude_HEADERS = \
$(srcdir)/../include/opensm/osm_subnet.h \
$(srcdir)/../include/opensm/osm_switch.h \
$(srcdir)/../include/opensm/osm_ucast_mgr.h \
+ $(srcdir)/../include/opensm/osm_ucast_file.h \
+ $(srcdir)/../include/opensm/osm_ucast_ftree.h \
+ $(srcdir)/../include/opensm/osm_ucast_lash.h \
$(srcdir)/../include/opensm/osm_ucast_minhop.h \
+ $(srcdir)/../include/opensm/osm_ucast_updn.h \
$(srcdir)/../include/opensm/osm_vl15intf.h \
$(top_builddir)/include/opensm/osm_version.h
diff --git a/opensm/opensm/osm_opensm.c b/opensm/opensm/osm_opensm.c
index 65fd632..4724c40 100644
--- a/opensm/opensm/osm_opensm.c
+++ b/opensm/opensm/osm_opensm.c
@@ -58,17 +58,16 @@
#include <opensm/osm_sm.h>
#include <opensm/osm_vl15intf.h>
#include <opensm/osm_event_plugin.h>
+#include <opensm/osm_ucast_file.h>
+#include <opensm/osm_ucast_ftree.h>
+#include <opensm/osm_ucast_lash.h>
+#include <opensm/osm_ucast_updn.h>
struct routing_engine_module {
const char *name;
int (*setup) (osm_opensm_t * p_osm);
};
-extern int osm_ucast_updn_setup(osm_opensm_t * p_osm);
-extern int osm_ucast_file_setup(osm_opensm_t * p_osm);
-extern int osm_ucast_ftree_setup(osm_opensm_t * p_osm);
-extern int osm_ucast_lash_setup(osm_opensm_t * p_osm);
-
static int osm_ucast_null_setup(osm_opensm_t * p_osm);
const static struct routing_engine_module routing_modules[] = {
--
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
