1
1

this commit fixes a few things. 1. silence warning in common sm. 2. remove unneeded config code in common sm. 3. move opal_shmem_base_close to a better place in opal_finalize. 4. fix opal_path_nfs output.

This commit was SVN r25518.
Этот коммит содержится в:
Samuel Gutierrez 2011-11-28 23:41:19 +00:00
родитель 0d55a3d739
Коммит 375162c693
4 изменённых файлов: 7 добавлений и 22 удалений

Просмотреть файл

@ -138,7 +138,7 @@ attach_and_init(const char *file_name,
* seg_num_procs_attached_and_inited. this value is used by
* opal_shmem_unlink.
*/
opal_atomic_add_size_t(&map->module_seg->seg_num_procs_inited, 1);
(void)opal_atomic_add_size_t(&map->module_seg->seg_num_procs_inited, 1);
opal_atomic_wmb();
return map;

Просмотреть файл

@ -20,25 +20,11 @@
# $HEADER$
#
# MCA_common_sm_POST_CONFIG([should_build])
# ------------------------------------------
AC_DEFUN([MCA_ompi_common_sm_POST_CONFIG], [
AM_CONDITIONAL([COMMON_SM_BUILD_WINDOWS],
[test $1 -eq 1 -a "x$common_sm_build_windows" = "x1"])
])dnl
# MCA_ompi_common_sm_CONFIG([action-if-can-compile],
# [action-if-cant-compile])
# ------------------------------------------------
AC_DEFUN([MCA_ompi_common_sm_CONFIG], [
AC_CONFIG_FILES([ompi/mca/common/sm/Makefile])
# Are we building on Windows?
AC_CHECK_FUNC(CreateFileMapping,
[common_sm_build_windows=1],
[common_sm_build_windows=0])
AC_DEFINE_UNQUOTED([MCA_COMMON_SM_WINDOWS],
[$common_sm_build_windows],
[Whether we have shared memory support for Windows or not])
$1
])dnl

Просмотреть файл

@ -243,7 +243,6 @@ segment_create(opal_shmem_ds_t *ds_buf,
size_t size)
{
int rc = OPAL_SUCCESS;
char *tmp_fn = NULL;
char *real_file_name = NULL;
pid_t my_pid = getpid();
/* the real size of the shared memory segment. this includes enough space
@ -312,7 +311,7 @@ segment_create(opal_shmem_ds_t *ds_buf,
gethostname(hn, MAXHOSTNAMELEN - 1);
hn[MAXHOSTNAMELEN - 1] = '\0';
opal_show_help("help-opal-shmem-mmap.txt", "mmap on nfs", 1, hn,
tmp_fn);
real_file_name);
}
if (-1 == (ds_buf->seg_id = open(real_file_name, O_CREAT | O_RDWR, 0600))) {
int err = errno;

Просмотреть файл

@ -10,7 +10,7 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2010 Los Alamos National Security, LLC.
* Copyright (c) 2010-2011 Los Alamos National Security, LLC.
* All rights reserved.
* $COPYRIGHT$
*
@ -126,9 +126,6 @@ opal_finalize(void)
opal_compress_base_close();
#endif
/* close the shmem framework */
opal_shmem_base_close();
opal_progress_finalize();
opal_event_base_close();
@ -151,6 +148,9 @@ opal_finalize(void)
/* close the carto framework */
opal_carto_base_close();
/* close the shmem framework */
opal_shmem_base_close();
/* close the hwloc framework */
opal_hwloc_base_close();