From b99fd08c3d43c73e8854d2b38a4cc5bbc162ece0 Mon Sep 17 00:00:00 2001
From: Mike Dubman <miked@mellanox.com>
Date: Sun, 10 Aug 2014 04:54:38 +0000
Subject: [PATCH] oshmem: scoll/fca - opal refactoring voices

based on http://www.open-mpi.org/community/lists/devel/2014/08/15590.php

This commit was SVN r32487.
---
 oshmem/mca/scoll/fca/scoll_fca_component.c |  2 +-
 oshmem/mca/scoll/fca/scoll_fca_module.c    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oshmem/mca/scoll/fca/scoll_fca_component.c b/oshmem/mca/scoll/fca/scoll_fca_component.c
index 8bc0d42b26..1b8d4485c2 100644
--- a/oshmem/mca/scoll/fca/scoll_fca_component.c
+++ b/oshmem/mca/scoll/fca/scoll_fca_component.c
@@ -150,7 +150,7 @@ int mca_scoll_fca_get_fca_lib(struct oshmem_group_t *group)
                   mca_scoll_fca_component.fca_spec_file);
         return OSHMEM_ERROR;
     }
-    spec->job_id = oshmem_proc_local()->proc_name.jobid;
+    spec->job_id = opal_process_name_jobid(oshmem_proc_local()->super.proc_name);
     spec->rank_id = oshmem_proc_pe(oshmem_proc_local());
     spec->progress.func = mca_scoll_fca_progress_cb;
     spec->progress.arg = NULL;
diff --git a/oshmem/mca/scoll/fca/scoll_fca_module.c b/oshmem/mca/scoll/fca/scoll_fca_module.c
index 88e78b2f0f..e8140faf23 100644
--- a/oshmem/mca/scoll/fca/scoll_fca_module.c
+++ b/oshmem/mca/scoll/fca/scoll_fca_module.c
@@ -112,7 +112,7 @@ static int have_remote_peers(struct oshmem_group_t *group,
     ret = 0;
     for (i = 0; i < size; ++i) {
         proc = group->proc_array[i];
-        if (OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
+        if (OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)) {
             ++*local_peers;
         } else {
             ret = 1;
@@ -135,8 +135,8 @@ static int _get_local_ranks(mca_scoll_fca_module_t *fca_module)
     fca_module->num_local_procs = 0;
     for (rank = 0; rank < comm->proc_count; ++rank) {
         proc = comm->proc_array[rank];
-        if (OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
-            if (proc->proc_name.vpid == (uint32_t) fca_module->rank) {
+        if (OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)) {
+            if (opal_process_name_vpid(proc->super.proc_name) == (uint32_t) fca_module->rank) {
                 fca_module->local_proc_idx = fca_module->num_local_procs;
             }
             ++fca_module->num_local_procs;
@@ -154,7 +154,7 @@ static int _get_local_ranks(mca_scoll_fca_module_t *fca_module)
     i = 0;
     for (rank = 0; rank < comm->proc_count; ++rank) {
         proc = comm->proc_array[rank];
-        if (OPAL_PROC_ON_LOCAL_NODE(proc->proc_flags)) {
+        if (OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags)) {
             fca_module->local_ranks[i++] = rank;
         }
     }
@@ -231,7 +231,7 @@ static int _fca_comm_new(mca_scoll_fca_module_t *fca_module)
     if (root_pe == comm->my_pe) {
         for (i = 0; i < comm->proc_count; i++) {
             if (mca_scoll_fca_component.rcounts[i] > 0) {
-                MCA_SPML_CALL(get((void *)mca_scoll_fca_component.my_info_exchangeable, mca_scoll_fca_component.rcounts[i], (void*)(((char*)all_info)+disps[i]),comm->proc_array[i]->proc_name.vpid));
+                MCA_SPML_CALL(get((void *)mca_scoll_fca_component.my_info_exchangeable, mca_scoll_fca_component.rcounts[i], (void*)(((char*)all_info)+disps[i]),opal_process_name_vpid(comm->proc_array[i]->super.proc_name)));
             }
         }
     }