ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #774 from jsquyres/pr/FUNCTION-fixes

Просмотр исходного кода 
__FUNCTION__ --> __func__ fixes
Этот коммит содержится в:
Jeff Squyres 2015-08-05 09:59:49 -04:00
родитель 6265aaa354 5065978a1e
Коммит ae0de54f6c
9 изменённых файлов: 24 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
ompi/mca/coll/libnbc/libdict/dict_private.h
Просмотреть файл

@ -47,7 +47,7 @@ typedef int (*icompare_func) __P((void *, void *itor2));
# define ASSERT(expr) \
if (!(expr)) \
fprintf(stderr, "\n%s:%d (%s) assertion failed: `%s'\n", \
__FILE__, __LINE__, __PRETTY_FUNCTION__, #expr), \
__FILE__, __LINE__, __func__, #expr), \
abort()
# else
# define ASSERT(expr) \

2
ompi/mca/topo/treematch/treematch/tm_bucket.c
Просмотреть файл

@ -514,7 +514,7 @@ void partial_update_val (int nb_args, void **args){
if(nb_args != 6){
if(verbose_level >= ERROR)
fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args);
fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args);
exit(-1);
}

2
ompi/mca/topo/treematch/treematch/tm_tree.c
Просмотреть файл

@ -239,7 +239,7 @@ void partial_aggregate_aff_mat (int nb_args, void **args){
if(nb_args != 6){
if(verbose_level >= ERROR)
fprintf(stderr,"Wrong number of args in %s: %d\n",__FUNCTION__, nb_args);
fprintf(stderr,"Wrong number of args in %s: %d\n",__func__, nb_args);
exit(-1);
}

5
oshmem/mca/atomic/base/base.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -42,14 +43,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_atomic_base_framework;
#ifdef OPAL_ENABLE_DEBUG
#define ATOMIC_VERBOSE(level, ...) \
oshmem_output_verbose(level, oshmem_atomic_base_framework.framework_output, \
"%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define ATOMIC_VERBOSE(level, ...)
#endif
#define ATOMIC_ERROR(...) \
oshmem_output(oshmem_atomic_base_framework.framework_output, \
"Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __func__, __VA_ARGS__)
END_C_DECLS

7
oshmem/mca/memheap/base/base.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework;
#ifdef OPAL_ENABLE_DEBUG
#define MEMHEAP_VERBOSE(level, ...) \
oshmem_output_verbose(level, oshmem_memheap_base_framework.framework_output, \
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define MEMHEAP_VERBOSE(level, ...)
#endif
#define MEMHEAP_ERROR(...) \
oshmem_output(oshmem_memheap_base_framework.framework_output, \
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#define MEMHEAP_WARN(...) \
oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
END_C_DECLS

5
oshmem/mca/scoll/base/base.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -54,14 +55,14 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework;
#ifdef OPAL_ENABLE_DEBUG
#define SCOLL_VERBOSE(level, ...) \
oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \
"%s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define SCOLL_VERBOSE(...)
#endif
#define SCOLL_ERROR(...) \
oshmem_output(oshmem_scoll_base_framework.framework_output, \
"Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __func__, __VA_ARGS__)
END_C_DECLS

7
oshmem/mca/spml/base/base.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -83,18 +84,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
#ifdef OPAL_ENABLE_DEBUG
#define SPML_VERBOSE(level, ...) \
oshmem_output_verbose(level, oshmem_spml_base_framework.framework_output, \
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define SPML_VERBOSE(level, ...)
#endif
#define SPML_ERROR(...) \
oshmem_output(oshmem_spml_base_framework.framework_output, \
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#define SPML_WARNING(...) \
oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
END_C_DECLS

7
oshmem/mca/sshmem/base/base.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2014 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -133,18 +134,18 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_sshmem_base_framework;
#if OPAL_ENABLE_DEBUG
#define SSHMEM_VERBOSE(level, ...) \
oshmem_output_verbose(level, oshmem_sshmem_base_framework.framework_output, \
"%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define SSHMEM_VERBOSE(level, ...)
#endif
#define SSHMEM_ERROR(...) \
oshmem_output(oshmem_sshmem_base_framework.framework_output, \
"Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
#define SSHMEM_WARN(...) \
oshmem_output_verbose(0, oshmem_sshmem_base_framework.framework_output, \
"Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __func__, __VA_ARGS__)
/*

5
oshmem/shmem/shmem_api_logger.h
Просмотреть файл

@ -1,6 +1,7 @@
/*
* Copyright (c) 2013 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -29,13 +30,13 @@ OSHMEM_DECLSPEC extern int shmem_api_logger_output;
#ifdef OPAL_ENABLE_DEBUG
#define SHMEM_API_VERBOSE(level, ...) \
oshmem_output_verbose(level, shmem_api_logger_output, \
"%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"%s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#else
#define SHMEM_API_VERBOSE(level, ...)
#endif
#define SHMEM_API_ERROR(...) \
oshmem_output(shmem_api_logger_output, \
"Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
"Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __func__, __VA_ARGS__)
#endif /*SHMEM_API_LOGGER_H*/