remove the unconditional opal_output's when mmap() fails, and instead, conditionally output the failure message via btl_base_verbose settings. This commit was SVN r19547.
Этот коммит содержится в:
родитель
e44ac3f36d
Коммит
eeabae49b9
@ -10,6 +10,7 @@
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -79,8 +80,6 @@ static mca_common_sm_mmap_t* create_map(int fd, size_t size, char *file_name,
|
||||
seg = (mca_common_sm_file_header_t*)
|
||||
mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
|
||||
if((void*)-1 == seg) {
|
||||
opal_output(0, "mca_common_sm_mmap_init: "
|
||||
"mmap failed with errno=%d\n", errno);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -10,6 +10,7 @@
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -262,7 +263,8 @@ static mca_mpool_base_module_t* mca_mpool_sm_init(
|
||||
file_name,sizeof(mca_common_sm_mmap_t), 8 )
|
||||
))
|
||||
{
|
||||
opal_output(0, "mca_mpool_sm_init: unable to create shared memory mapping (%s)", file_name);
|
||||
opal_output(mca_mpool_sm_component.verbose,
|
||||
"mca_mpool_sm_init: unable to create shared memory mapping (%s)", file_name);
|
||||
free(file_name);
|
||||
free(mpool_module);
|
||||
return NULL;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user