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

s/CACHE_LINE_SIZE/BASESMUMA_CACHE_LINE_SIZE/g to avoid a system macro

Просмотр исходного кода 
name clash on some BSDs.

cmr=v1.7.4:reviewer=pasha

This commit was SVN r30230.
Этот коммит содержится в:
Jeff Squyres 2014-01-10 16:48:43 +00:00
родитель 217e61e345
Коммит 53a3defde9
3 изменённых файлов: 8 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
ompi/mca/bcol/basesmuma/bcol_basesmuma.h
Просмотреть файл

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved. * Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -48,7 +49,7 @@ OBJ_CLASS_DECLARATION(list_data_t);
* synchronous, and get the upper 48 bits from the local process space. * synchronous, and get the upper 48 bits from the local process space.
*/ */
#define CACHE_LINE_SIZE 128 #define BASESMUMA_CACHE_LINE_SIZE 128
#define SHIFT_UP << #define SHIFT_UP <<
#define SHIFT_DOWN >> #define SHIFT_DOWN >>
@ -426,7 +427,7 @@ typedef struct mca_bcol_basesmuma_component_t mca_bcol_basesmuma_component_t;
/* pading */ /* pading */
/* Note: need to change this so it takes less memory */ /* Note: need to change this so it takes less memory */
char padding[CACHE_LINE_SIZE-3*sizeof(uint64_t)]; char padding[BASESMUMA_CACHE_LINE_SIZE-3*sizeof(uint64_t)];
}; };
typedef struct mca_bcol_basesmuma_nb_request_process_shared_mem_t typedef struct mca_bcol_basesmuma_nb_request_process_shared_mem_t
@ -489,7 +490,7 @@ typedef struct mca_bcol_basesmuma_component_t mca_bcol_basesmuma_component_t;
#endif #endif
/* padding */ /* padding */
/* ok, no room to pad anymore */ /* ok, no room to pad anymore */
/*char padding[CACHE_LINE_SIZE-5*sizeof(int64_t)-8*sizeof(int)];*/ /*char padding[BASESMUMA_CACHE_LINE_SIZE-5*sizeof(int64_t)-8*sizeof(int)];*/
}; };
typedef struct mca_bcol_basesmuma_ctl_struct_t mca_bcol_basesmuma_ctl_struct_t; typedef struct mca_bcol_basesmuma_ctl_struct_t mca_bcol_basesmuma_ctl_struct_t;

3
ompi/mca/bcol/basesmuma/bcol_basesmuma_buf_mgmt.c
Просмотреть файл

@ -3,6 +3,7 @@
* Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. * Copyright (c) 2012 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -392,7 +393,7 @@ int bcol_basesmuma_bank_init_opti(struct mca_coll_ml_module_t *ml_module,
input_file.file_name = sm_reg_data->file_name; input_file.file_name = sm_reg_data->file_name;
input_file.size = sm_reg_data->size; input_file.size = sm_reg_data->size;
input_file.size_ctl_structure = 0; input_file.size_ctl_structure = 0;
input_file.data_seg_alignment = CACHE_LINE_SIZE; input_file.data_seg_alignment = BASESMUMA_CACHE_LINE_SIZE;
input_file.mpool_size = sm_reg_data->size; input_file.mpool_size = sm_reg_data->size;
/* call the connection manager and map my shared memory peers' file /* call the connection manager and map my shared memory peers' file

3
ompi/mca/bcol/basesmuma/bcol_basesmuma_setup.c
Просмотреть файл

@ -3,6 +3,7 @@
* Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved. * Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
* Copyright (c) 2012 Los Alamos National Security, LLC. * Copyright (c) 2012 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -384,7 +385,7 @@ int base_bcol_basesmuma_setup_ctl_struct(
input_file.file_name=cs->sm_ctl_structs->map_path; input_file.file_name=cs->sm_ctl_structs->map_path;
input_file.size=cs->sm_ctl_structs->map_size; input_file.size=cs->sm_ctl_structs->map_size;
input_file.size_ctl_structure=0; input_file.size_ctl_structure=0;
input_file.data_seg_alignment=CACHE_LINE_SIZE; input_file.data_seg_alignment=BASESMUMA_CACHE_LINE_SIZE;
input_file.mpool_size=cs->sm_ctl_structs->map_size; input_file.mpool_size=cs->sm_ctl_structs->map_size;
ret=bcol_basesmuma_smcm_allgather_connection( ret=bcol_basesmuma_smcm_allgather_connection(
sm_bcol_module, sm_bcol_module,