ras: remove orte_ras_proc_t and associated code

orte/mca/ras/Makefile.am

@@ -9,7 +9,9 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,7 +27,7 @@ libmca_ras_la_SOURCES =
 dist_ortedata_DATA =
 
 # local files
-headers = ras.h ras_types.h
+headers = ras.h
 libmca_ras_la_SOURCES += $(headers)
 
 # Conditionally install the header files

orte/mca/ras/base/ras_base_node.c

@@ -12,6 +12,8 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -33,31 +35,6 @@
 
 #include "orte/mca/ras/base/ras_private.h"
 
-static void orte_ras_base_proc_construct(orte_ras_proc_t* proc)
-{
-    proc->node_name = NULL;
-    proc->cpu_list = NULL;
-    proc->rank = ORTE_VPID_MAX;
-}
-
-static void orte_ras_base_proc_destruct(orte_ras_proc_t* proc)
-{
-    if (NULL != proc->node_name) {
-        free(proc->node_name);
-    }
-    if (NULL != proc->cpu_list) {
-        free(proc->cpu_list);
-    }
-}
-
-
-OBJ_CLASS_INSTANCE(
-    orte_ras_proc_t,
-    opal_list_item_t,
-    orte_ras_base_proc_construct,
-    orte_ras_base_proc_destruct);
-
-
 /*
  * Add the specified node definitions to the global data store
  * NOTE: this removes all items from the list!

orte/mca/ras/base/ras_private.h

@@ -12,6 +12,8 @@
  * Copyright (c) 2008      UT-Battelle, LLC. All rights reserved.
  * Copyright (c) 2011      Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -33,8 +35,6 @@
 
 #include "opal/class/opal_list.h"
 
-#include "orte/mca/ras/ras_types.h"
-
 #include "orte/mca/ras/ras.h"
 #include "orte/mca/ras/base/base.h"
 

orte/mca/ras/ras.h

@@ -12,6 +12,8 @@
  *                         All rights reserved.
  * Copyright (c) 2011-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -60,8 +62,6 @@
 
 #include "orte/runtime/orte_globals.h"
 
-#include "ras_types.h"
-
 BEGIN_C_DECLS
 
 /* allocation event - the event one activates to schedule resource

orte/mca/ras/ras_types.h

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef ORTE_MCA_RAS_TYPES_H
-#define ORTE_MCA_RAS_TYPES_H
-
-#include "orte_config.h"
-#include "orte/types.h"
-
-#include "opal/class/opal_list.h"
-
-BEGIN_C_DECLS
-
-struct orte_ras_proc_t{
-    /** Base object */
-    opal_list_item_t super;
-    /** String node name */
-    char *node_name;
-    /* the rank of this proc (default -1) */
-    orte_std_cntr_t rank;
-    /* cpu list as defined (if defined) in the hostfile */
-    char *cpu_list;
-    /* whther or not this process is allocated to a map */
-};
-
-typedef struct orte_ras_proc_t orte_ras_proc_t;
-
-ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_ras_proc_t);
-
-
-END_C_DECLS
-
-#endif

orte/mca/rmaps/rank_file/rmaps_rank_file.c

@@ -48,7 +48,6 @@
 #include "orte/mca/rmaps/rank_file/rmaps_rank_file.h"
 #include "orte/mca/rmaps/rank_file/rmaps_rank_file_lex.h"
 #include "orte/runtime/orte_globals.h"
-#include "orte/mca/ras/ras_types.h"
 
 static int orte_rmaps_rank_file_parse(const char *);
 static char *orte_rmaps_rank_file_parse_string_or_int(void);

orte/tools/orte-ps/orte-ps.c

@@ -72,7 +72,6 @@
 #include "orte/util/proc_info.h"
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/comm/comm.h"
-#include "orte/mca/ras/ras_types.h"
 #if OPAL_ENABLE_FT_CR == 1
 #include "orte/mca/snapc/base/base.h"
 #endif