globalexit() should use common approach using orte_errmgr.abort()

This commit was SVN r29434.

oshmem/shmem/c/globalexit.c

@@ -12,14 +12,7 @@
 #include "oshmem/include/shmem.h"
 #include "oshmem/runtime/runtime.h"
 
-#include "orte/mca/odls/odls_types.h"
 #include "orte/mca/errmgr/errmgr.h"
-#include "opal/dss/dss.h"
-#include "orte/mca/rml/rml.h"
-
-#if WANT_PMI_SUPPORT
-#include <pmi.h>
-#endif
 
 extern int inGlobalExit;
 
@@ -27,18 +20,7 @@ void globalexit(int status)
 {
     inGlobalExit++;
 
-    if ((ORTE_JOBID_INVALID != ORTE_PROC_MY_DAEMON->jobid) &&
-        (0 != ORTE_PROC_MY_DAEMON->jobid) )
-    {
-        orte_errmgr.abort(status, NULL);
-    }
-    else
-    {
-#if WANT_PMI_SUPPORT
-        PMI_Abort(status, NULL);
-#endif /* WANT_PMI_SUPPORT */
-        _exit(status);
-    }
+    orte_errmgr.abort(status, NULL);
     
     oshmem_shmem_aborted = true;
     exit(status);

oshmem/tools/oshmem_info/Makefile.am

@@ -46,8 +46,6 @@ oshmem_info_SOURCES = \
         oshmem_info.c \
         param.c
 
-oshmem_info_CFLAGS  = $(AM_CFLAGS) $(pmi_oshmem_CPPFLAGS)
-oshmem_info_LDFLAGS = $(pmi_oshmem_LDFLAGS) $(pmi_oshmem_LIBS)
 oshmem_info_LDADD = $(top_builddir)/ompi/libmpi.la
 oshmem_info_LDADD += $(top_builddir)/oshmem/libshmem.la
 if OMPI_RTE_ORTE

oshmem/tools/oshmem_info/oshmem_info.c

@@ -44,7 +44,9 @@
 
 #include "ompi/runtime/ompi_info_support.h"
 
+/*
 #include "oshmem/include/oshmem/frameworks.h"
+*/
 #include "oshmem/include/oshmem/constants.h"
 #include "oshmem/tools/oshmem_info/oshmem_info.h"
 #include "oshmem/runtime/oshmem_info_support.h"