Skip to content

Commit cd45c7a

Browse files
ggouaillardetggouaillardet
committed
ompio: misc renames
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 36b35ae commit cd45c7a

File tree

113 files changed

+844
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+844
-734
lines changed

‎ompi/mca/common/ompio/common_ompio.h

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -102,41 +102,41 @@ enum ompio_fs_type
102102
PLFS = 4
103103
};
104104

105-
typedef struct mca_io_ompio_io_array_t {
105+
typedef struct mca_common_ompio_io_array_t {
106106
void *memory_address;
107107
/* we need that of type OMPI_MPI_OFFSET_TYPE */
108108
void *offset;
109109
size_t length;
110-
/*mca_io_ompio_server_t io_server;*/
111-
} mca_io_ompio_io_array_t;
110+
/*mca_common_ompio_server_t io_server;*/
111+
} mca_common_ompio_io_array_t;
112112

113113

114-
typedef struct mca_io_ompio_access_array_t{
114+
typedef struct mca_common_ompio_access_array_t{
115115
OMPI_MPI_OFFSET_TYPE *offsets;
116116
int *lens;
117117
MPI_Aint *mem_ptrs;
118118
int count;
119-
} mca_io_ompio_access_array_t;
119+
} mca_common_ompio_access_array_t;
120120

121121

122122
/* forward declaration to keep the compiler happy. */
123-
struct mca_io_ompio_file_t;
124-
typedef int (*mca_io_ompio_generate_current_file_view_fn_t) (struct mca_io_ompio_file_t *fh,
125-
size_t max_data,
126-
struct iovec **f_iov,
127-
int *iov_count);
123+
struct ompio_file_t;
124+
typedef int (*mca_common_ompio_generate_current_file_view_fn_t) (struct ompio_file_t *fh,
125+
size_t max_data,
126+
struct iovec **f_iov,
127+
int *iov_count);
128128

129129
/* functions to retrieve the number of aggregators and the size of the
130130
temporary buffer on aggregators from the fcoll modules */
131-
typedef int (*mca_io_ompio_get_mca_parameter_value_fn_t) ( char *mca_parameter_name, int name_length );
131+
typedef int (*mca_common_ompio_get_mca_parameter_value_fn_t) ( char *mca_parameter_name, int name_length );
132132

133133

134134
struct mca_common_ompio_print_queue;
135135

136136
/**
137137
* Back-end structure for MPI_File
138138
*/
139-
struct mca_io_ompio_file_t {
139+
struct ompio_file_t {
140140
/* General parameters */
141141
int fd;
142142
struct ompi_file_t *f_fh; /* pointer back to the file_t structure */
@@ -183,7 +183,7 @@ struct mca_io_ompio_file_t {
183183
size_t f_etype_size;
184184

185185
/* contains IO requests that needs to be read/written */
186-
mca_io_ompio_io_array_t *f_io_array;
186+
mca_common_ompio_io_array_t *f_io_array;
187187
int f_num_of_io_entries;
188188

189189
/* Hooks for modules to hang things */
@@ -215,85 +215,85 @@ struct mca_io_ompio_file_t {
215215
int f_procs_per_group;
216216

217217
/* internal ompio functions required by fbtl and fcoll */
218-
mca_io_ompio_generate_current_file_view_fn_t f_generate_current_file_view;
218+
mca_common_ompio_generate_current_file_view_fn_t f_generate_current_file_view;
219219

220-
mca_io_ompio_get_mca_parameter_value_fn_t f_get_mca_parameter_value;
220+
mca_common_ompio_get_mca_parameter_value_fn_t f_get_mca_parameter_value;
221221
};
222-
typedef struct mca_io_ompio_file_t mca_io_ompio_file_t;
222+
typedef struct ompio_file_t ompio_file_t;
223223

224-
struct mca_io_ompio_data_t {
225-
mca_io_ompio_file_t ompio_fh;
224+
struct mca_common_ompio_data_t {
225+
ompio_file_t ompio_fh;
226226
};
227-
typedef struct mca_io_ompio_data_t mca_io_ompio_data_t;
227+
typedef struct mca_common_ompio_data_t mca_common_ompio_data_t;
228228

229229

230230
#include "common_ompio_print_queue.h"
231231
#include "common_ompio_aggregators.h"
232232

233-
OMPI_DECLSPEC int mca_common_ompio_file_write (mca_io_ompio_file_t *fh, const void *buf, int count,
233+
OMPI_DECLSPEC int mca_common_ompio_file_write (ompio_file_t *fh, const void *buf, int count,
234234
struct ompi_datatype_t *datatype,
235235
ompi_status_public_t *status);
236236

237-
OMPI_DECLSPEC int mca_common_ompio_file_write_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
237+
OMPI_DECLSPEC int mca_common_ompio_file_write_at (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
238238
int count, struct ompi_datatype_t *datatype,
239239
ompi_status_public_t *status);
240240

241-
OMPI_DECLSPEC int mca_common_ompio_file_iwrite (mca_io_ompio_file_t *fh, const void *buf, int count,
241+
OMPI_DECLSPEC int mca_common_ompio_file_iwrite (ompio_file_t *fh, const void *buf, int count,
242242
struct ompi_datatype_t *datatype, ompi_request_t **request);
243243

244-
OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
244+
OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
245245
const void *buf, int count, struct ompi_datatype_t *datatype,
246246
ompi_request_t **request);
247247

248-
OMPI_DECLSPEC int mca_common_ompio_file_write_at_all (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
248+
OMPI_DECLSPEC int mca_common_ompio_file_write_at_all (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
249249
int count, struct ompi_datatype_t *datatype,
250250
ompi_status_public_t *status);
251251

252252

253-
OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at_all (mca_io_ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
253+
OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at_all (ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
254254
int count, struct ompi_datatype_t *datatype, ompi_request_t **request);
255255

256-
OMPI_DECLSPEC int mca_common_ompio_build_io_array ( mca_io_ompio_file_t *fh, int index, int cycles,
256+
OMPI_DECLSPEC int mca_common_ompio_build_io_array ( ompio_file_t *fh, int index, int cycles,
257257
size_t bytes_per_cycle, int max_data, uint32_t iov_count,
258258
struct iovec *decoded_iov, int *ii, int *jj, size_t *tbw,
259259
size_t *spc );
260260

261261

262-
OMPI_DECLSPEC int mca_common_ompio_file_read (mca_io_ompio_file_t *fh, void *buf, int count,
262+
OMPI_DECLSPEC int mca_common_ompio_file_read (ompio_file_t *fh, void *buf, int count,
263263
struct ompi_datatype_t *datatype, ompi_status_public_t *status);
264264

265-
OMPI_DECLSPEC int mca_common_ompio_file_read_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, void *buf,
265+
OMPI_DECLSPEC int mca_common_ompio_file_read_at (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, void *buf,
266266
int count, struct ompi_datatype_t *datatype,
267267
ompi_status_public_t * status);
268268

269-
OMPI_DECLSPEC int mca_common_ompio_file_iread (mca_io_ompio_file_t *fh, void *buf, int count,
269+
OMPI_DECLSPEC int mca_common_ompio_file_iread (ompio_file_t *fh, void *buf, int count,
270270
struct ompi_datatype_t *datatype, ompi_request_t **request);
271271

272-
OMPI_DECLSPEC int mca_common_ompio_file_iread_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
272+
OMPI_DECLSPEC int mca_common_ompio_file_iread_at (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
273273
void *buf, int count, struct ompi_datatype_t *datatype,
274274
ompi_request_t **request);
275275

276-
OMPI_DECLSPEC int mca_common_ompio_file_read_at_all (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
276+
OMPI_DECLSPEC int mca_common_ompio_file_read_at_all (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
277277
void *buf, int count, struct ompi_datatype_t *datatype,
278278
ompi_status_public_t * status);
279279

280-
OMPI_DECLSPEC int mca_common_ompio_file_iread_at_all (mca_io_ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset,
280+
OMPI_DECLSPEC int mca_common_ompio_file_iread_at_all (ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset,
281281
void *buf, int count, struct ompi_datatype_t *datatype,
282282
ompi_request_t **request);
283283

284284
OMPI_DECLSPEC int mca_common_ompio_file_open (ompi_communicator_t *comm, const char *filename,
285285
int amode, opal_info_t *info,
286-
mca_io_ompio_file_t *ompio_fh, bool use_sharedfp);
286+
ompio_file_t *ompio_fh, bool use_sharedfp);
287287

288288
int mca_common_ompio_file_delete (const char *filename,
289289
struct opal_info_t *info);
290290

291-
OMPI_DECLSPEC int mca_common_ompio_file_close (mca_io_ompio_file_t *ompio_fh);
292-
OMPI_DECLSPEC int mca_common_ompio_file_get_size (mca_io_ompio_file_t *ompio_fh, OMPI_MPI_OFFSET_TYPE *size);
293-
OMPI_DECLSPEC int mca_common_ompio_file_get_position (mca_io_ompio_file_t *fh,OMPI_MPI_OFFSET_TYPE *offset);
294-
OMPI_DECLSPEC int mca_common_ompio_set_explicit_offset (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset);
295-
OMPI_DECLSPEC int mca_common_ompio_set_file_defaults (mca_io_ompio_file_t *fh);
296-
OMPI_DECLSPEC int mca_common_ompio_set_view (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE disp,
291+
OMPI_DECLSPEC int mca_common_ompio_file_close (ompio_file_t *ompio_fh);
292+
OMPI_DECLSPEC int mca_common_ompio_file_get_size (ompio_file_t *ompio_fh, OMPI_MPI_OFFSET_TYPE *size);
293+
OMPI_DECLSPEC int mca_common_ompio_file_get_position (ompio_file_t *fh,OMPI_MPI_OFFSET_TYPE *offset);
294+
OMPI_DECLSPEC int mca_common_ompio_set_explicit_offset (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset);
295+
OMPI_DECLSPEC int mca_common_ompio_set_file_defaults (ompio_file_t *fh);
296+
OMPI_DECLSPEC int mca_common_ompio_set_view (ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE disp,
297297
ompi_datatype_t *etype, ompi_datatype_t *filetype, const char *datarep,
298298
opal_info_t *info);
299299

@@ -302,14 +302,14 @@ OMPI_DECLSPEC int mca_common_ompio_set_view (mca_io_ompio_file_t *fh, OMPI_MPI_
302302
* Function that takes in a datatype and buffer, and decodes that datatype
303303
* into an iovec using the convertor_raw function
304304
*/
305-
OMPI_DECLSPEC int mca_common_ompio_decode_datatype (struct mca_io_ompio_file_t *fh,
305+
OMPI_DECLSPEC int mca_common_ompio_decode_datatype (struct ompio_file_t *fh,
306306
struct ompi_datatype_t *datatype,
307307
int count,
308308
const void *buf,
309309
size_t *max_data,
310310
struct iovec **iov,
311311
uint32_t *iov_count);
312312

313-
OMPI_DECLSPEC int mca_common_ompio_set_callbacks(mca_io_ompio_generate_current_file_view_fn_t generate_current_file_view,
314-
mca_io_ompio_get_mca_parameter_value_fn_t get_mca_parameter_value);
313+
OMPI_DECLSPEC int mca_common_ompio_set_callbacks(mca_common_ompio_generate_current_file_view_fn_t generate_current_file_view,
314+
mca_common_ompio_get_mca_parameter_value_fn_t get_mca_parameter_value);
315315
#endif /* MCA_COMMON_OMPIO_H */

‎ompi/mca/common/ompio/common_ompio_aggregators.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2008-2017 University of Houston. All rights reserved.
1414
* Copyright (c) 2011-2018 Cisco Systems, Inc. All rights reserved
1515
* Copyright (c) 2012-2013 Inria. All rights reserved.
16-
* Copyright (c) 2015-2017 Research Organization for Information Science
16+
* Copyright (c) 2015-2018 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
1919
* $COPYRIGHT$
@@ -57,7 +57,7 @@ static double cost_calc (int P, int P_agg, size_t Data_proc, size_t coll_buffer,
5757
#define DIM1 1
5858
#define DIM2 2
5959

60-
int mca_common_ompio_simple_grouping(mca_io_ompio_file_t *fh,
60+
int mca_common_ompio_simple_grouping(ompio_file_t *fh,
6161
int *num_groups_out,
6262
mca_common_ompio_contg *contg_groups)
6363
{
@@ -186,7 +186,7 @@ int mca_common_ompio_simple_grouping(mca_io_ompio_file_t *fh,
186186
return mca_common_ompio_forced_grouping ( fh, num_groups, contg_groups);
187187
}
188188

189-
int mca_common_ompio_forced_grouping ( mca_io_ompio_file_t *fh,
189+
int mca_common_ompio_forced_grouping ( ompio_file_t *fh,
190190
int num_groups,
191191
mca_common_ompio_contg *contg_groups)
192192
{
@@ -224,7 +224,7 @@ int mca_common_ompio_forced_grouping ( mca_io_ompio_file_t *fh,
224224
return OMPI_SUCCESS;
225225
}
226226

227-
int mca_common_ompio_fview_based_grouping(mca_io_ompio_file_t *fh,
227+
int mca_common_ompio_fview_based_grouping(ompio_file_t *fh,
228228
int *num_groups,
229229
mca_common_ompio_contg *contg_groups)
230230
{
@@ -321,7 +321,7 @@ int mca_common_ompio_fview_based_grouping(mca_io_ompio_file_t *fh,
321321
return ret;
322322
}
323323

324-
int mca_common_ompio_cart_based_grouping(mca_io_ompio_file_t *ompio_fh,
324+
int mca_common_ompio_cart_based_grouping(ompio_file_t *ompio_fh,
325325
int *num_groups,
326326
mca_common_ompio_contg *contg_groups)
327327
{
@@ -448,7 +448,7 @@ int mca_common_ompio_cart_based_grouping(mca_io_ompio_file_t *ompio_fh,
448448

449449

450450

451-
int mca_common_ompio_finalize_initial_grouping(mca_io_ompio_file_t *fh,
451+
int mca_common_ompio_finalize_initial_grouping(ompio_file_t *fh,
452452
int num_groups,
453453
mca_common_ompio_contg *contg_groups)
454454
{
@@ -501,7 +501,7 @@ int mca_common_ompio_finalize_initial_grouping(mca_io_ompio_file_t *fh,
501501
** of aggregators.
502502
*/
503503

504-
int mca_common_ompio_set_aggregator_props (struct mca_io_ompio_file_t *fh,
504+
int mca_common_ompio_set_aggregator_props (struct ompio_file_t *fh,
505505
int num_aggregators,
506506
size_t bytes_per_proc)
507507
{
@@ -546,7 +546,7 @@ int mca_common_ompio_set_aggregator_props (struct mca_io_ompio_file_t *fh,
546546
/*****************************************************************************************************/
547547
/*****************************************************************************************************/
548548
/*****************************************************************************************************/
549-
int mca_common_ompio_create_groups(mca_io_ompio_file_t *fh,
549+
int mca_common_ompio_create_groups(ompio_file_t *fh,
550550
size_t bytes_per_proc)
551551
{
552552

@@ -681,7 +681,7 @@ int mca_common_ompio_create_groups(mca_io_ompio_file_t *fh,
681681
return ret;
682682
}
683683

684-
int mca_common_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
684+
int mca_common_ompio_merge_initial_groups(ompio_file_t *fh,
685685
OMPI_MPI_OFFSET_TYPE *aggr_bytes_per_group,
686686
int *decision_list,
687687
int is_aggregator){
@@ -881,7 +881,7 @@ int mca_common_ompio_merge_initial_groups(mca_io_ompio_file_t *fh,
881881
return ret;
882882
}
883883

884-
int mca_common_ompio_split_initial_groups(mca_io_ompio_file_t *fh,
884+
int mca_common_ompio_split_initial_groups(ompio_file_t *fh,
885885
OMPI_MPI_OFFSET_TYPE *start_offsets_lens,
886886
OMPI_MPI_OFFSET_TYPE *end_offsets,
887887
OMPI_MPI_OFFSET_TYPE bytes_per_group){
@@ -1018,7 +1018,7 @@ int mca_common_ompio_split_initial_groups(mca_io_ompio_file_t *fh,
10181018
}
10191019

10201020

1021-
int mca_common_ompio_retain_initial_groups(mca_io_ompio_file_t *fh){
1021+
int mca_common_ompio_retain_initial_groups(ompio_file_t *fh){
10221022

10231023
int i = 0;
10241024

@@ -1036,7 +1036,7 @@ int mca_common_ompio_retain_initial_groups(mca_io_ompio_file_t *fh){
10361036
return OMPI_SUCCESS;
10371037
}
10381038

1039-
int mca_common_ompio_merge_groups(mca_io_ompio_file_t *fh,
1039+
int mca_common_ompio_merge_groups(ompio_file_t *fh,
10401040
int *merge_aggrs,
10411041
int num_merge_aggrs)
10421042
{
@@ -1125,7 +1125,7 @@ int mca_common_ompio_merge_groups(mca_io_ompio_file_t *fh,
11251125

11261126

11271127

1128-
int mca_common_ompio_split_a_group(mca_io_ompio_file_t *fh,
1128+
int mca_common_ompio_split_a_group(ompio_file_t *fh,
11291129
OMPI_MPI_OFFSET_TYPE *start_offsets_lens,
11301130
OMPI_MPI_OFFSET_TYPE *end_offsets,
11311131
int size_new_group,
@@ -1186,7 +1186,7 @@ int mca_common_ompio_split_a_group(mca_io_ompio_file_t *fh,
11861186
return OMPI_SUCCESS;
11871187
}
11881188

1189-
int mca_common_ompio_finalize_split(mca_io_ompio_file_t *fh,
1189+
int mca_common_ompio_finalize_split(ompio_file_t *fh,
11901190
int size_new_group,
11911191
int size_last_group)
11921192
{
@@ -1240,7 +1240,7 @@ int mca_common_ompio_finalize_split(mca_io_ompio_file_t *fh,
12401240
return OMPI_SUCCESS;
12411241
}
12421242

1243-
int mca_common_ompio_prepare_to_group(mca_io_ompio_file_t *fh,
1243+
int mca_common_ompio_prepare_to_group(ompio_file_t *fh,
12441244
OMPI_MPI_OFFSET_TYPE **start_offsets_lens,
12451245
OMPI_MPI_OFFSET_TYPE **end_offsets, // need it?
12461246
OMPI_MPI_OFFSET_TYPE **aggr_bytes_per_group,

0 commit comments

Comments
 (0)