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

Code cleanup

Просмотр исходного кода 
This commit was SVN r15783.
Этот коммит содержится в:
Aurelien Bouteiller 2007-08-06 22:20:44 +00:00
родитель 69952d9603
Коммит ca69915b1e
2 изменённых файлов: 18 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
ompi/mca/pml/v/pml_v_output.h
Просмотреть файл

@ -26,11 +26,17 @@ void pml_v_output_finalize(void);
/* Tricky stuff to define V_OUTPUT and V_OUTPUT_VERBOSE with variadic arguments /* Tricky stuff to define V_OUTPUT and V_OUTPUT_VERBOSE with variadic arguments
*/ */
#if defined(ACCEPT_C99) #if defined(ACCEPT_C99)
# define V_OUTPUT(ARGS...) OPAL_OUTPUT((mca_pml_v.output, __VA_ARGS__)) # define V_OUTPUT(ARGS...) \
# define V_OUTPUT_VERBOSE(V, ARGS...) OPAL_OUTPUT_VERBOSE((V, mca_pml_v.output, __VA_ARGS__)) OPAL_OUTPUT((mca_pml_v.output, __VA_ARGS__))
# define V_OUTPUT_VERBOSE(V, ARGS...) \
OPAL_OUTPUT_VERBOSE((V, mca_pml_v.output, __VA_ARGS__))
#elif defined(__GNUC__) && !defined(__STDC__) #elif defined(__GNUC__) && !defined(__STDC__)
# define V_OUTPUT(ARGS...) OPAL_OUTPUT((mca_pml_v.output, ARGS)) # define V_OUTPUT(ARGS...) \
# define V_OUTPUT_VERBOSE(V, ARGS...) OPAL_OUTPUT_VERBOSE((V, mca_pml_v.output, ARGS)) OPAL_OUTPUT((mca_pml_v.output, ARGS))
# define V_OUTPUT_VERBOSE(V, ARGS...) \
OPAL_OUTPUT_VERBOSE((V, mca_pml_v.output, ARGS))
#elif OMPI_ENABLE_DEBUG #elif OMPI_ENABLE_DEBUG
/* No variadic macros available... So sad */ /* No variadic macros available... So sad */
static inline void V_OUTPUT(const char* fmt, ... ) { static inline void V_OUTPUT(const char* fmt, ... ) {
@ -55,6 +61,7 @@ static inline void V_OUTPUT_VERBOSE(int V, const char* fmt, ... ) {
free(str); free(str);
va_end(list); va_end(list);
} }
#else /* !DEBUG */ #else /* !DEBUG */
/* Some compilers complain if we have ... and no corresponding va_start() */ /* Some compilers complain if we have ... and no corresponding va_start() */
static inline void V_OUTPUT(const char* fmt, ... ) { static inline void V_OUTPUT(const char* fmt, ... ) {

14
ompi/mca/pml/v/pml_v_protocol_base.c
Просмотреть файл

@ -65,19 +65,19 @@ int mca_pml_v_protocol_base_select(bool enable_progress_threads, bool enable_mpi
cli = (mca_base_component_list_item_t *) item; cli = (mca_base_component_list_item_t *) item;
component = (mca_pml_v_protocol_base_component_t *) cli->cli_component; component = (mca_pml_v_protocol_base_component_t *) cli->cli_component;
V_OUTPUT_VERBOSE(15, "vprotocol select: initializing %s component %s", component->pmlm_version.mca_type_name, component->pmlm_version.mca_component_name); V_OUTPUT_VERBOSE(500, "vprotocol select: initializing %s component %s", component->pmlm_version.mca_type_name, component->pmlm_version.mca_component_name);
if (NULL == component->pmlm_init) { if (NULL == component->pmlm_init) {
V_OUTPUT_VERBOSE(1, "vprotocol select: no init function; ignoring component %s", component->pmlm_version.mca_component_name); V_OUTPUT_VERBOSE(2, "vprotocol select: no init function; ignoring component %s", component->pmlm_version.mca_component_name);
} }
else else
{ {
module = component->pmlm_init(&priority, enable_progress_threads, enable_mpi_threads); module = component->pmlm_init(&priority, enable_progress_threads, enable_mpi_threads);
if (NULL == module) { if (NULL == module) {
V_OUTPUT_VERBOSE(1, "vprotocol select: init returned failure for component %s", component->pmlm_version.mca_component_name); V_OUTPUT_VERBOSE(2, "vprotocol select: init returned failure for component %s", component->pmlm_version.mca_component_name);
} }
else else
{ {
V_OUTPUT_VERBOSE(15, "vprotocol select: component %s init returned priority %d", component->pmlm_version.mca_component_name, priority); V_OUTPUT_VERBOSE(500, "vprotocol select: component %s init returned priority %d", component->pmlm_version.mca_component_name, priority);
if (priority > best_priority) if (priority > best_priority)
{ {
best_priority = priority; best_priority = priority;
@ -96,7 +96,7 @@ int mca_pml_v_protocol_base_select(bool enable_progress_threads, bool enable_mpi
/* Finished querying all components. Check for the bozo case. */ /* Finished querying all components. Check for the bozo case. */
if (NULL == best_component) { if (NULL == best_component) {
V_OUTPUT_VERBOSE(1, "vprotocol select: no protocol has returned a positive priority, user don't want fault tolerance"); V_OUTPUT_VERBOSE(2, "vprotocol select: no protocol has returned a positive priority, user don't want fault tolerance");
} }
else else
{ {
@ -112,7 +112,7 @@ int mca_pml_v_protocol_base_select(bool enable_progress_threads, bool enable_mpi
om = (opened_component_t *) item; om = (opened_component_t *) item;
if (om->om_component != best_component) { if (om->om_component != best_component) {
/* Finalize */ /* Finalize */
V_OUTPUT_VERBOSE(15, "vprotocol select: component %s not selected / finalized", om->om_component->pmlm_version.mca_component_name); V_OUTPUT_VERBOSE(500, "vprotocol select: component %s not selected / finalized", om->om_component->pmlm_version.mca_component_name);
if (NULL != om->om_component->pmlm_finalize) { if (NULL != om->om_component->pmlm_finalize) {
/* Blatently ignore the return code (what would we do to /* Blatently ignore the return code (what would we do to
recover, anyway? This component is going away, so errors recover, anyway? This component is going away, so errors
@ -135,7 +135,7 @@ int mca_pml_v_protocol_base_select(bool enable_progress_threads, bool enable_mpi
/* All done */ /* All done */
if(best_component != NULL) if(best_component != NULL)
{ {
V_OUTPUT_VERBOSE(10, "vprotocol select: component %s selected", mca_pml_v.protocol_component.pmlm_version.mca_component_name); V_OUTPUT_VERBOSE(500, "vprotocol select: component %s selected", mca_pml_v.protocol_component.pmlm_version.mca_component_name);
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
else else