1
1

Fixes trac:3989: opal_pack_debug was instantiated as a bool in one file

and extern'ed s an int in another.  This caused a SIBGUS on
Solaris/SPARC.

This commit properly moves the extern to a .h file so that it's the
same in all files.  It also moves the DO_DEBUG to the header file,
because it was defined to the same thing in multiple .c files.

cmr=v1.7.4:reviewer=bosilca:subject=fix SPARC SIGBUS in opal convertor code

This commit was SVN r29991.

The following Trac tickets were found above:
  Ticket 3989 --> https://svn.open-mpi.org/trac/ompi/ticket/3989
Этот коммит содержится в:
Jeff Squyres 2013-12-19 21:38:51 +00:00
родитель b745078535
Коммит a88e143127
4 изменённых файлов: 16 добавлений и 19 удалений

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

@ -4,6 +4,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -50,6 +51,14 @@ opal_convertor_master_t* opal_convertor_find_or_create_master( uint32_t remote_a
*/
void opal_convertor_destroy_masters( void );
#if OPAL_ENABLE_DEBUG
extern bool opal_pack_debug;
#define DO_DEBUG(INST) if( opal_pack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OPAL_ENABLE_DEBUG */
END_C_DECLS
#endif /* OPAL_CONVERTOR_INTERNAL_HAS_BEEN_INCLUDED */

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

@ -4,6 +4,7 @@
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -17,15 +18,11 @@
#include "opal/datatype/opal_convertor_internal.h"
#include "opal/datatype/opal_datatype_internal.h"
#include "opal_stdint.h"
#if OPAL_ENABLE_DEBUG
#include "opal/util/output.h"
extern int opal_pack_debug;
#define DO_DEBUG(INST) if( opal_pack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OPAL_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
/**
* This function always work in local representation. This means no representation
@ -68,8 +65,8 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
return 1; /* we're done */
}
DO_DEBUG( opal_output( 0, "opal_convertor_raw( %p, {%p, %u}, %lu )\n", (void*)pConvertor,
(void*)iov, *iov_count, (unsigned long)*length ); );
DO_DEBUG( opal_output( 0, "opal_convertor_raw( %p, {%p, %" PRIu32 "}, %"PRIsize_t " )\n", (void*)pConvertor,
(void*)iov, *iov_count, *length ); );
description = pConvertor->use_desc->desc;

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

@ -11,6 +11,7 @@
* Copyright (c) 2004-2006 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -26,13 +27,7 @@
#include "opal/datatype/opal_datatype_internal.h"
#if OPAL_ENABLE_DEBUG
#include "opal/util/output.h"
extern bool opal_pack_debug;
#define DO_DEBUG(INST) if( opal_pack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OPAL_ENABLE_DEBUG */
#include "opal/datatype/opal_datatype_checksum.h"

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

@ -12,6 +12,7 @@
* All rights reserved.
* Copyright (c) 2008-2009 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -29,11 +30,6 @@
#if OPAL_ENABLE_DEBUG
#include "opal/util/output.h"
extern bool opal_unpack_debug;
#define DO_DEBUG(INST) if( opal_unpack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OPAL_ENABLE_DEBUG */
#include "opal/datatype/opal_datatype_checksum.h"