Fix a holdover mistake from the directory re-org:

- orte/class/ompi_proc_table.[ch] -> orte/class/orte_proc_table.[ch] - opal_hash_table_[get|set|remove]_proc -> orte_hash_table_[get|set|remove]_proc This commit was SVN r6549.
2005-07-19 12:25:19 +00:00 · 2005-07-19 12:25:19 +00:00 · 74744dd9df
--- a/ompi/mca/btl/portals/src/btl_portals.h
+++ b/ompi/mca/btl/portals/src/btl_portals.h
@ -26,7 +26,7 @@
 #include "ompi/mca/btl/base/base.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_free_list.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"

 #include "btl_portals_endpoint.h"

--- a/ompi/mca/ptl/mx/ptl_mx.h
+++ b/ompi/mca/ptl/mx/ptl_mx.h
@ -25,7 +25,7 @@
 #include "mca/ptl/ptl.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_free_list.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"

 #define MCA_PTL_MX_STATISTICS 0

--- a/ompi/mca/ptl/mx/ptl_mx_proc.c
+++ b/ompi/mca/ptl/mx/ptl_mx_proc.c
@ -19,7 +19,7 @@
 #include <string.h>

 #include "include/sys/atomic.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"
 #include "mca/pml/base/pml_base_module_exchange.h"
 #include "ptl_mx.h"
 #include "ptl_mx_peer.h"
--- a/ompi/mca/ptl/portals/src/ptl_portals.h
+++ b/ompi/mca/ptl/portals/src/ptl_portals.h
@ -25,7 +25,7 @@
 #include "mca/ptl/ptl.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_free_list.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"


 /*
--- a/ompi/mca/ptl/tcp/ptl_tcp_proc.c
+++ b/ompi/mca/ptl/tcp/ptl_tcp_proc.c
@ -19,7 +19,7 @@
 #include <string.h>

 #include "include/sys/atomic.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"
 #include "mca/pml/base/pml_base_module_exchange.h"
 #include "mca/ns/ns_types.h"
 #include "ptl_tcp.h"
@ -62,7 +62,7 @@ void mca_ptl_tcp_proc_destruct(mca_ptl_tcp_proc_t* proc)
 {
    /* remove from list of all proc instances */
    OPAL_THREAD_LOCK(&mca_ptl_tcp_component.tcp_lock);
-    opal_hash_table_remove_proc(&mca_ptl_tcp_component.tcp_procs, &proc->proc_name);
+    orte_hash_table_remove_proc(&mca_ptl_tcp_component.tcp_procs, &proc->proc_name);
    OPAL_THREAD_UNLOCK(&mca_ptl_tcp_component.tcp_lock);

    /* release resources */
@ -86,7 +86,7 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_create(ompi_proc_t* ompi_proc)
    mca_ptl_tcp_proc_t* ptl_proc;

    OPAL_THREAD_LOCK(&mca_ptl_tcp_component.tcp_lock);
-    ptl_proc = (mca_ptl_tcp_proc_t*)opal_hash_table_get_proc(
+    ptl_proc = (mca_ptl_tcp_proc_t*)orte_hash_table_get_proc(
         &mca_ptl_tcp_component.tcp_procs, &ompi_proc->proc_name);
    if(NULL != ptl_proc) {
        OPAL_THREAD_UNLOCK(&mca_ptl_tcp_component.tcp_lock);
@ -100,7 +100,7 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_create(ompi_proc_t* ompi_proc)
    ptl_proc->proc_name = ompi_proc->proc_name;

    /* add to hash table of all proc instance */
-    opal_hash_table_set_proc(
+    orte_hash_table_set_proc(
        &mca_ptl_tcp_component.tcp_procs, 
        &ptl_proc->proc_name, 
         ptl_proc);
@ -143,7 +143,7 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_lookup(const orte_process_name_t *name)
 {
    mca_ptl_tcp_proc_t* proc;
    OPAL_THREAD_LOCK(&mca_ptl_tcp_component.tcp_lock);
-    proc = (mca_ptl_tcp_proc_t*)opal_hash_table_get_proc(
+    proc = (mca_ptl_tcp_proc_t*)orte_hash_table_get_proc(
         &mca_ptl_tcp_component.tcp_procs, name);
    OPAL_THREAD_UNLOCK(&mca_ptl_tcp_component.tcp_lock);
    return proc;
--- a/orte/class/Makefile.am
+++ b/orte/class/Makefile.am
@ -22,14 +22,14 @@ noinst_LTLIBRARIES = libclass.la
 # Source code files

 headers = \
-        ompi_proc_table.h \
+        orte_proc_table.h \
        orte_bitmap.h \
        orte_pointer_array.h \
        orte_value_array.h

 libclass_la_SOURCES = \
 	$(headers) \
-        ompi_proc_table.c \
+        orte_proc_table.c \
        orte_bitmap.c \
        orte_pointer_array.c \
        orte_value_array.c
--- a/orte/class/orte_proc_table.c
+++ b/orte/class/orte_proc_table.c
@ -21,7 +21,7 @@

 #include "include/constants.h"
 #include "opal/util/output.h"
-#include "class/ompi_proc_table.h"
+#include "orte/class/orte_proc_table.h"


 /*
@ -43,7 +43,7 @@ static OBJ_CLASS_INSTANCE(
    NULL);


-void* opal_hash_table_get_proc(opal_hash_table_t* ht, 
+void* orte_hash_table_get_proc(opal_hash_table_t* ht, 
    const orte_process_name_t* proc)
 {
    uint32_t key = (proc->cellid << 24) + (proc->jobid << 16) + proc->vpid;
@ -68,7 +68,7 @@ void* opal_hash_table_get_proc(opal_hash_table_t* ht,
 }


-int opal_hash_table_set_proc(
+int orte_hash_table_set_proc(
    opal_hash_table_t* ht,
    const orte_process_name_t* proc, 
    void* value)
@ -107,7 +107,7 @@ int opal_hash_table_set_proc(
 }


-int opal_hash_table_remove_proc(
+int orte_hash_table_remove_proc(
    opal_hash_table_t* ht, 
    const orte_process_name_t* proc)
 {
--- a/orte/class/orte_proc_table.h
+++ b/orte/class/orte_proc_table.h
@ -20,11 +20,11 @@
 *  A hash table indexed by orte_process_name_t.
 */

-#ifndef OMPI_PROC_TABLE_H
-#define OMPI_PROC_TABLE_H
+#ifndef ORTE_PROC_TABLE_H
+#define ORTE_PROC_TABLE_H

 #include "class/opal_hash_table.h"
-#include "mca/ns/ns_types.h"
+#include "orte/mca/ns/ns_types.h"

 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
@ -40,7 +40,7 @@ extern "C" {
 *
 */

-OMPI_DECLSPEC void *opal_hash_table_get_proc(
+OMPI_DECLSPEC void *orte_hash_table_get_proc(
    opal_hash_table_t* table, 
    const orte_process_name_t* key);

@ -54,7 +54,7 @@ OMPI_DECLSPEC void *opal_hash_table_get_proc(
 *
 */

-OMPI_DECLSPEC int opal_hash_table_set_proc(
+OMPI_DECLSPEC int orte_hash_table_set_proc(
    opal_hash_table_t* table, 
    const orte_process_name_t*, 
    void* value);
@ -68,7 +68,7 @@ OMPI_DECLSPEC int opal_hash_table_set_proc(
 *
 */

-OMPI_DECLSPEC int opal_hash_table_remove_proc(
+OMPI_DECLSPEC int orte_hash_table_remove_proc(
    opal_hash_table_t* table, 
    const orte_process_name_t* key);

--- a/orte/mca/iof/svc/iof_svc_proxy.c
+++ b/orte/mca/iof/svc/iof_svc_proxy.c
@ -207,10 +207,10 @@ static void orte_iof_svc_proxy_ack(
            if (orte_ns.compare(pub->pub_mask,&pub->pub_name,src) == 0 ||
                orte_ns.compare(ORTE_NS_CMP_ALL,&pub->pub_proxy,src) == 0) {
                value.uval = hdr->msg_seq + hdr->msg_len;
-                opal_hash_table_set_proc(&fwd->fwd_seq,
+                orte_hash_table_set_proc(&fwd->fwd_seq,
                                         &hdr->msg_src, &value.vval);
            } else {
-                value.vval = opal_hash_table_get_proc(&fwd->fwd_seq,
+                value.vval = orte_hash_table_get_proc(&fwd->fwd_seq,
                                                      &hdr->msg_src);
                if(value.uval < seq_min) {
                    seq_min = value.uval;
--- a/orte/mca/iof/svc/iof_svc_sub.h
+++ b/orte/mca/iof/svc/iof_svc_sub.h
@ -2,7 +2,7 @@
 #define MCA_IOF_SVC_SUBSCRIPT_H

 #include "class/orte_pointer_array.h"
-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"

 /**
 * A subscription routes data from a specified set
--- a/orte/mca/oob/tcp/oob_tcp.c
+++ b/orte/mca/oob/tcp/oob_tcp.c
@ -34,7 +34,7 @@
 #include "include/ompi_socket_errno.h"
 #include "opal/util/output.h"
 #include "opal/util/if.h"
-#include "class/ompi_proc_table.h"
+#include "orte/class/orte_proc_table.h"
 #include "mca/oob/tcp/oob_tcp.h"
 #include "mca/errmgr/errmgr.h"
 #include "mca/ns/ns.h"
@ -587,7 +587,7 @@ void mca_oob_tcp_registry_callback(
                }
    
                /* check for existing cache entry */
-                existing = (mca_oob_tcp_addr_t *)opal_hash_table_get_proc(
+                existing = (mca_oob_tcp_addr_t *)orte_hash_table_get_proc(
                    &mca_oob_tcp_component.tcp_peer_names, &addr->addr_name);
                if(NULL != existing) {
                    /* TSW - need to update existing entry */
@ -596,7 +596,7 @@ void mca_oob_tcp_registry_callback(
                }
    
                /* insert into cache and notify peer */
-                opal_hash_table_set_proc(&mca_oob_tcp_component.tcp_peer_names, &addr->addr_name, addr);
+                orte_hash_table_set_proc(&mca_oob_tcp_component.tcp_peer_names, &addr->addr_name, addr);
                peer = (mca_oob_tcp_peer_t *)opal_hash_table_get_proc(
                    &mca_oob_tcp_component.tcp_peers, &addr->addr_name);
                if(NULL != peer)
--- a/orte/mca/oob/tcp/oob_tcp_msg.c
+++ b/orte/mca/oob/tcp/oob_tcp_msg.c
@ -16,7 +16,7 @@
 #include "ompi_config.h"
 #include "include/ompi_socket_errno.h"

-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"
 #include "include/constants.h"
 #include "mca/ns/ns.h"
 #include "mca/oob/tcp/oob_tcp.h"
@ -351,9 +351,9 @@ static void mca_oob_tcp_msg_ident(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pe
    
    OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
    if (orte_ns.compare(ORTE_NS_CMP_ALL, &peer->peer_name, &src) != 0) {
-        opal_hash_table_remove_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name);
+        orte_hash_table_remove_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name);
        peer->peer_name = src;
-        opal_hash_table_set_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name, peer);
+        orte_hash_table_set_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name, peer);
    }
    OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
 }
--- a/orte/mca/oob/tcp/oob_tcp_peer.c
+++ b/orte/mca/oob/tcp/oob_tcp_peer.c
@ -35,7 +35,7 @@
 #include <netinet/tcp.h>
 #endif

-#include "class/ompi_proc_table.h"
+#include "class/orte_proc_table.h"
 #include "opal/util/output.h"

 #include "mca/gpr/gpr.h"
@ -192,7 +192,7 @@ mca_oob_tcp_peer_t * mca_oob_tcp_peer_lookup(const orte_process_name_t* name)
    }
    
    OPAL_THREAD_LOCK(&mca_oob_tcp_component.tcp_lock);
-    peer = (mca_oob_tcp_peer_t*)opal_hash_table_get_proc(
+    peer = (mca_oob_tcp_peer_t*)orte_hash_table_get_proc(
       &mca_oob_tcp_component.tcp_peers, name);
    if(NULL != peer && memcmp(&peer->peer_name,name,sizeof(peer->peer_name)) == 0) {
        OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
@ -227,7 +227,7 @@ mca_oob_tcp_peer_t * mca_oob_tcp_peer_lookup(const orte_process_name_t* name)
    peer->peer_retries = 0;

    /* add to lookup table */
-    if(OMPI_SUCCESS != opal_hash_table_set_proc(&mca_oob_tcp_component.tcp_peers, 
+    if(OMPI_SUCCESS != orte_hash_table_set_proc(&mca_oob_tcp_component.tcp_peers, 
        &peer->peer_name, peer)) {
        MCA_OOB_TCP_PEER_RETURN(peer);
        OPAL_THREAD_UNLOCK(&mca_oob_tcp_component.tcp_lock);
--- a/orte/mca/oob/tcp/oob_tcp_peer.h
+++ b/orte/mca/oob/tcp/oob_tcp_peer.h
@ -91,7 +91,7 @@ OBJ_CLASS_DECLARATION(mca_oob_tcp_peer_t);
 #define MCA_OOB_TCP_PEER_RETURN(peer) \
    { \
    mca_oob_tcp_peer_shutdown(peer); \
-    opal_hash_table_remove_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name); \
+    orte_hash_table_remove_proc(&mca_oob_tcp_component.tcp_peers, &peer->peer_name); \
    OPAL_FREE_LIST_RETURN(&mca_oob_tcp_component.tcp_peer_free, (opal_list_item_t*)peer); \
    }