[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b1-93-g5fb750b

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  5fb750b97cb0a95d13a1b31a1952100c58c7dfd6 (commit)
      from  e60c9375492793c7ab4d784fd03facca35555d43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/5fb750b97cb0a95d13a1b31a1952100c58c7dfd6

commit 5fb750b97cb0a95d13a1b31a1952100c58c7dfd6
Author: Sangmin Seo <sseo at anl.gov>
Date:   Wed Apr 22 09:29:04 2015 -0500

    Fix wrong alias names.
    
    __attribute__((weak,alias())) should have function names starting with
    PMPI, but some MPIX functions, such as MPIX_Grequest_class_create,
    MPIX_Grequest_class_allocate, MPIX_Grequest_start, MPIX_Mutex_create,
    MPIX_Mutex_free, MPIX_Mutex_lock, and MPIX_Mutex_unlock, had the same
    alias names as those of original functions. This patch fixes wrong
    alias names in __attribute__((weak,alias())) and also fixes some wrong
    alias names in #pragma.
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/src/mpi/pt2pt/greq_start.c b/src/mpi/pt2pt/greq_start.c
index 5ec7075..8137024 100644
--- a/src/mpi/pt2pt/greq_start.c
+++ b/src/mpi/pt2pt/greq_start.c
@@ -236,7 +236,7 @@ int MPIX_Grequest_class_create(MPI_Grequest_query_function *query_fn,
         MPI_Grequest_cancel_function *cancel_fn,
         MPIX_Grequest_poll_function *poll_fn,
         MPIX_Grequest_wait_function *wait_fn,
-        MPIX_Grequest_class *greq_class) __attribute__((weak,alias("MPIX_Grequest_class_create")));
+        MPIX_Grequest_class *greq_class) __attribute__((weak,alias("PMPIX_Grequest_class_create")));
 #endif
 /* -- End Profiling Symbol Block */
 
@@ -324,11 +324,11 @@ fn_fail:
 #if defined(HAVE_PRAGMA_WEAK)
 #pragma weak MPIX_Grequest_class_allocate = PMPIX_Grequest_class_allocate
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_Grequest_class_allocate MPIX_Grequest_class_allocate
+#pragma _HP_SECONDARY_DEF PMPIX_Grequest_class_allocate MPIX_Grequest_class_allocate
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Grequest_class_allocate as PMPIX_Grequest_class_allocate
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("MPIX_Grequest_class_allocate")));
+int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("PMPIX_Grequest_class_allocate")));
 #endif
 /* -- End Profiling Symbol Block */
 
@@ -369,7 +369,7 @@ int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class,
 #if defined(HAVE_PRAGMA_WEAK)
 #pragma weak MPIX_Grequest_start = PMPIX_Grequest_start
 #elif defined(HAVE_PRAGMA_HP_SEC_DEF)
-#pragma _HP_SECONDARY_DEF PMPI_Grequest_start MPIX_Grequest_start
+#pragma _HP_SECONDARY_DEF PMPIX_Grequest_start MPIX_Grequest_start
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Grequest_start as PMPIX_Grequest_start
 #elif defined(HAVE_WEAK_ATTRIBUTE)
@@ -379,7 +379,7 @@ int MPIX_Grequest_start( MPI_Grequest_query_function *query_fn,
         MPIX_Grequest_poll_function *poll_fn,
         MPIX_Grequest_wait_function *wait_fn,
         void *extra_state,
-        MPI_Request *request ) __attribute__((weak,alias("MPIX_Grequest_start")));
+        MPI_Request *request ) __attribute__((weak,alias("PMPIX_Grequest_start")));
 #endif
 /* -- End Profiling Symbol Block */
 
diff --git a/src/mutex/mutex_create.c b/src/mutex/mutex_create.c
index eec39c1..91c0766 100644
--- a/src/mutex/mutex_create.c
+++ b/src/mutex/mutex_create.c
@@ -23,7 +23,7 @@
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Mutex_create as PMPIX_Mutex_create
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("MPIX_Mutex_create")));
+int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("PMPIX_Mutex_create")));
 #endif
 /* -- End Profiling Symbol Block */
 
diff --git a/src/mutex/mutex_free.c b/src/mutex/mutex_free.c
index 79715ca..b3c4877 100644
--- a/src/mutex/mutex_free.c
+++ b/src/mutex/mutex_free.c
@@ -20,7 +20,7 @@
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Mutex_free as PMPIX_Mutex_free
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("MPIX_Mutex_free")));
+int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("PMPIX_Mutex_free")));
 #endif
 /* -- End Profiling Symbol Block */
 
diff --git a/src/mutex/mutex_lock.c b/src/mutex/mutex_lock.c
index 257e80f..4c4846d 100644
--- a/src/mutex/mutex_lock.c
+++ b/src/mutex/mutex_lock.c
@@ -21,7 +21,7 @@
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Mutex_lock as PMPIX_Mutex_lock
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_lock")));
+int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_lock")));
 #endif
 /* -- End Profiling Symbol Block */
 
diff --git a/src/mutex/mutex_unlock.c b/src/mutex/mutex_unlock.c
index 722f8b9..7930f17 100644
--- a/src/mutex/mutex_unlock.c
+++ b/src/mutex/mutex_unlock.c
@@ -21,7 +21,7 @@
 #elif defined(HAVE_PRAGMA_CRI_DUP)
 #pragma _CRI duplicate MPIX_Mutex_unlock as PMPIX_Mutex_unlock
 #elif defined(HAVE_WEAK_ATTRIBUTE)
-int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_unlock")));
+int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_unlock")));
 #endif
 /* -- End Profiling Symbol Block */
 

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/pt2pt/greq_start.c |   10 +++++-----
 src/mutex/mutex_create.c   |    2 +-
 src/mutex/mutex_free.c     |    2 +-
 src/mutex/mutex_lock.c     |    2 +-
 src/mutex/mutex_unlock.c   |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
MPICH primary repository