Skip to content

Commit 07dbcc7

Browse files
ggouaillardetggouaillardet
committed
osc: do not cast way the const modifier when this is not necessary
update the osc framework and mpi c bindings (back-ported from commit open-mpi/ompi@21642a2)
1 parent 7ebc998 commit 07dbcc7

File tree

13 files changed

+56
-52
lines changed

13 files changed

+56
-52
lines changed

‎ompi/mca/osc/osc.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ typedef int (*ompi_osc_base_module_win_detach_fn_t)(struct ompi_win_t *win, cons
203203
typedef int (*ompi_osc_base_module_free_fn_t)(struct ompi_win_t *win);
204204

205205

206-
typedef int (*ompi_osc_base_module_put_fn_t)(void *origin_addr,
206+
typedef int (*ompi_osc_base_module_put_fn_t)(const void *origin_addr,
207207
int origin_count,
208208
struct ompi_datatype_t *origin_dt,
209209
int target,
@@ -223,7 +223,7 @@ typedef int (*ompi_osc_base_module_get_fn_t)(void *origin_addr,
223223
struct ompi_win_t *win);
224224

225225

226-
typedef int (*ompi_osc_base_module_accumulate_fn_t)(void *origin_addr,
226+
typedef int (*ompi_osc_base_module_accumulate_fn_t)(const void *origin_addr,
227227
int origin_count,
228228
struct ompi_datatype_t *origin_dt,
229229
int target,
@@ -262,7 +262,7 @@ typedef int (*ompi_osc_base_module_get_accumulate_fn_t)(const void *origin_addr,
262262
struct ompi_op_t *op,
263263
struct ompi_win_t *win);
264264

265-
typedef int (*ompi_osc_base_module_rput_fn_t)(void *origin_addr,
265+
typedef int (*ompi_osc_base_module_rput_fn_t)(const void *origin_addr,
266266
int origin_count,
267267
struct ompi_datatype_t *origin_dt,
268268
int target,
@@ -294,8 +294,8 @@ typedef int (*ompi_osc_base_module_raccumulate_fn_t)(const void *origin_addr,
294294
struct ompi_win_t *win,
295295
struct ompi_request_t **request);
296296

297-
typedef int (*ompi_osc_base_module_rget_accumulate_fn_t)(void *origin_addr,
298-
int origin_count,
297+
typedef int (*ompi_osc_base_module_rget_accumulate_fn_t)(const void *origin_addr,
298+
int origin_count,
299299
struct ompi_datatype_t *origin_datatype,
300300
void *result_addr,
301301
int result_count,

‎ompi/mca/osc/portals4/osc_portals4.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ int ompi_osc_portals4_detach(struct ompi_win_t *win, const void *base);
122122

123123
int ompi_osc_portals4_free(struct ompi_win_t *win);
124124

125-
int ompi_osc_portals4_put(void *origin_addr,
125+
int ompi_osc_portals4_put(const void *origin_addr,
126126
int origin_count,
127127
struct ompi_datatype_t *origin_dt,
128128
int target,
@@ -140,7 +140,7 @@ int ompi_osc_portals4_get(void *origin_addr,
140140
struct ompi_datatype_t *target_dt,
141141
struct ompi_win_t *win);
142142

143-
int ompi_osc_portals4_accumulate(void *origin_addr,
143+
int ompi_osc_portals4_accumulate(const void *origin_addr,
144144
int origin_count,
145145
struct ompi_datatype_t *origin_dt,
146146
int target,
@@ -179,7 +179,7 @@ int ompi_osc_portals4_get_accumulate(const void *origin_addr,
179179
struct ompi_op_t *op,
180180
struct ompi_win_t *win);
181181

182-
int ompi_osc_portals4_rput(void *origin_addr,
182+
int ompi_osc_portals4_rput(const void *origin_addr,
183183
int origin_count,
184184
struct ompi_datatype_t *origin_dt,
185185
int target,
@@ -210,8 +210,8 @@ int ompi_osc_portals4_raccumulate(const void *origin_addr,
210210
struct ompi_win_t *win,
211211
struct ompi_request_t **request);
212212

213-
int ompi_osc_portals4_rget_accumulate(void *origin_addr,
214-
int origin_count,
213+
int ompi_osc_portals4_rget_accumulate(const void *origin_addr,
214+
int origin_count,
215215
struct ompi_datatype_t *origin_datatype,
216216
void *result_addr,
217217
int result_count,

‎ompi/mca/osc/portals4/osc_portals4_comm.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ ompi_osc_portals4_get_dt(struct ompi_datatype_t *dt, ptl_datatype_t *ptl_dt)
182182

183183

184184
int
185-
ompi_osc_portals4_rput(void *origin_addr,
185+
ompi_osc_portals4_rput(const void *origin_addr,
186186
int origin_count,
187187
struct ompi_datatype_t *origin_dt,
188188
int target,
@@ -417,8 +417,8 @@ ompi_osc_portals4_raccumulate(const void *origin_addr,
417417

418418

419419
int
420-
ompi_osc_portals4_rget_accumulate(void *origin_addr,
421-
int origin_count,
420+
ompi_osc_portals4_rget_accumulate(const void *origin_addr,
421+
int origin_count,
422422
struct ompi_datatype_t *origin_dt,
423423
void *result_addr,
424424
int result_count,
@@ -582,7 +582,7 @@ ompi_osc_portals4_rget_accumulate(void *origin_addr,
582582

583583

584584
int
585-
ompi_osc_portals4_put(void *origin_addr,
585+
ompi_osc_portals4_put(const void *origin_addr,
586586
int origin_count,
587587
struct ompi_datatype_t *origin_dt,
588588
int target,
@@ -694,7 +694,7 @@ ompi_osc_portals4_get(void *origin_addr,
694694

695695

696696
int
697-
ompi_osc_portals4_accumulate(void *origin_addr,
697+
ompi_osc_portals4_accumulate(const void *origin_addr,
698698
int origin_count,
699699
struct ompi_datatype_t *origin_dt,
700700
int target,

‎ompi/mca/osc/pt2pt/osc_pt2pt.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ int ompi_osc_pt2pt_detach(struct ompi_win_t *win, const void *base);
252252

253253
int ompi_osc_pt2pt_free(struct ompi_win_t *win);
254254

255-
int ompi_osc_pt2pt_put(void *origin_addr,
255+
int ompi_osc_pt2pt_put(const void *origin_addr,
256256
int origin_count,
257257
struct ompi_datatype_t *origin_dt,
258258
int target,
@@ -261,7 +261,7 @@ int ompi_osc_pt2pt_put(void *origin_addr,
261261
struct ompi_datatype_t *target_dt,
262262
struct ompi_win_t *win);
263263

264-
int ompi_osc_pt2pt_accumulate(void *origin_addr,
264+
int ompi_osc_pt2pt_accumulate(const void *origin_addr,
265265
int origin_count,
266266
struct ompi_datatype_t *origin_dt,
267267
int target,
@@ -309,7 +309,7 @@ int ompi_osc_pt2pt_get_accumulate(const void *origin_addr,
309309
struct ompi_op_t *op,
310310
struct ompi_win_t *win);
311311

312-
int ompi_osc_pt2pt_rput(void *origin_addr,
312+
int ompi_osc_pt2pt_rput(const void *origin_addr,
313313
int origin_count,
314314
struct ompi_datatype_t *origin_dt,
315315
int target,
@@ -340,7 +340,7 @@ int ompi_osc_pt2pt_raccumulate(const void *origin_addr,
340340
struct ompi_win_t *win,
341341
struct ompi_request_t **request);
342342

343-
int ompi_osc_pt2pt_rget_accumulate(void *origin_addr,
343+
int ompi_osc_pt2pt_rget_accumulate(const void *origin_addr,
344344
int origin_count,
345345
struct ompi_datatype_t *origin_datatype,
346346
void *result_addr,

‎ompi/mca/osc/pt2pt/osc_pt2pt_comm.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int ompi_osc_pt2pt_dt_send_complete (ompi_request_t *request)
8282
}
8383

8484
/* self communication optimizations */
85-
static inline int ompi_osc_pt2pt_put_self (void *source, int source_count, ompi_datatype_t *source_datatype,
85+
static inline int ompi_osc_pt2pt_put_self (const void *source, int source_count, ompi_datatype_t *source_datatype,
8686
OPAL_PTRDIFF_TYPE target_disp, int target_count, ompi_datatype_t *target_datatype,
8787
ompi_osc_pt2pt_module_t *module, ompi_osc_pt2pt_request_t *request)
8888
{
@@ -103,7 +103,7 @@ static inline int ompi_osc_pt2pt_put_self (void *source, int source_count, ompi_
103103
return OMPI_ERR_RMA_SYNC;
104104
}
105105

106-
ret = ompi_datatype_sndrcv (source, source_count, source_datatype,
106+
ret = ompi_datatype_sndrcv ((void *)source, source_count, source_datatype,
107107
target, target_count, target_datatype);
108108
if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
109109
return ret;
@@ -286,7 +286,7 @@ static inline int ompi_osc_pt2pt_gacc_self (const void *source, int source_count
286286
}
287287
/* end: self communication optimizations */
288288

289-
static inline int ompi_osc_pt2pt_put_w_req (void *origin_addr, int origin_count,
289+
static inline int ompi_osc_pt2pt_put_w_req (const void *origin_addr, int origin_count,
290290
struct ompi_datatype_t *origin_dt,
291291
int target, OPAL_PTRDIFF_TYPE target_disp,
292292
int target_count, struct ompi_datatype_t *target_dt,
@@ -450,7 +450,7 @@ static inline int ompi_osc_pt2pt_put_w_req (void *origin_addr, int origin_count,
450450
}
451451

452452
int
453-
ompi_osc_pt2pt_put(void *origin_addr, int origin_count,
453+
ompi_osc_pt2pt_put(const void *origin_addr, int origin_count,
454454
struct ompi_datatype_t *origin_dt,
455455
int target, OPAL_PTRDIFF_TYPE target_disp,
456456
int target_count,
@@ -635,7 +635,7 @@ ompi_osc_pt2pt_accumulate_w_req (const void *origin_addr, int origin_count,
635635
}
636636

637637
int
638-
ompi_osc_pt2pt_accumulate(void *origin_addr, int origin_count,
638+
ompi_osc_pt2pt_accumulate(const void *origin_addr, int origin_count,
639639
struct ompi_datatype_t *origin_dt,
640640
int target, OPAL_PTRDIFF_TYPE target_disp,
641641
int target_count,
@@ -746,7 +746,7 @@ int ompi_osc_pt2pt_fetch_and_op(const void *origin_addr, void *result_addr,
746746
target, target_disp, 1, dt, op, win);
747747
}
748748

749-
int ompi_osc_pt2pt_rput(void *origin_addr, int origin_count,
749+
int ompi_osc_pt2pt_rput(const void *origin_addr, int origin_count,
750750
struct ompi_datatype_t *origin_dt,
751751
int target, OPAL_PTRDIFF_TYPE target_disp,
752752
int target_count, struct ompi_datatype_t *target_dt,
@@ -1205,7 +1205,7 @@ int ompi_osc_pt2pt_get_accumulate(const void *origin_addr, int origin_count,
12051205
}
12061206

12071207

1208-
int ompi_osc_pt2pt_rget_accumulate(void *origin_addr, int origin_count,
1208+
int ompi_osc_pt2pt_rget_accumulate(const void *origin_addr, int origin_count,
12091209
struct ompi_datatype_t *origin_dt,
12101210
void *result_addr, int result_count,
12111211
struct ompi_datatype_t *result_dt,

‎ompi/mca/osc/sm/osc_sm.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int ompi_osc_sm_detach(struct ompi_win_t *win, const void *base);
9191

9292
int ompi_osc_sm_free(struct ompi_win_t *win);
9393

94-
int ompi_osc_sm_put(void *origin_addr,
94+
int ompi_osc_sm_put(const void *origin_addr,
9595
int origin_count,
9696
struct ompi_datatype_t *origin_dt,
9797
int target,
@@ -109,7 +109,7 @@ int ompi_osc_sm_get(void *origin_addr,
109109
struct ompi_datatype_t *target_dt,
110110
struct ompi_win_t *win);
111111

112-
int ompi_osc_sm_accumulate(void *origin_addr,
112+
int ompi_osc_sm_accumulate(const void *origin_addr,
113113
int origin_count,
114114
struct ompi_datatype_t *origin_dt,
115115
int target,
@@ -148,7 +148,7 @@ int ompi_osc_sm_get_accumulate(const void *origin_addr,
148148
struct ompi_op_t *op,
149149
struct ompi_win_t *win);
150150

151-
int ompi_osc_sm_rput(void *origin_addr,
151+
int ompi_osc_sm_rput(const void *origin_addr,
152152
int origin_count,
153153
struct ompi_datatype_t *origin_dt,
154154
int target,
@@ -179,7 +179,7 @@ int ompi_osc_sm_raccumulate(const void *origin_addr,
179179
struct ompi_win_t *win,
180180
struct ompi_request_t **request);
181181

182-
int ompi_osc_sm_rget_accumulate(void *origin_addr,
182+
int ompi_osc_sm_rget_accumulate(const void *origin_addr,
183183
int origin_count,
184184
struct ompi_datatype_t *origin_datatype,
185185
void *result_addr,

‎ompi/mca/osc/sm/osc_sm_comm.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "osc_sm.h"
2222

2323
int
24-
ompi_osc_sm_rput(void *origin_addr,
24+
ompi_osc_sm_rput(const void *origin_addr,
2525
int origin_count,
2626
struct ompi_datatype_t *origin_dt,
2727
int target,
@@ -45,7 +45,7 @@ ompi_osc_sm_rput(void *origin_addr,
4545

4646
remote_address = ((char*) (module->bases[target])) + module->disp_units[target] * target_disp;
4747

48-
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
48+
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
4949
remote_address, target_count, target_dt);
5050
if (OMPI_SUCCESS != ret) {
5151
return ret;
@@ -149,8 +149,8 @@ ompi_osc_sm_raccumulate(const void *origin_addr,
149149

150150

151151
int
152-
ompi_osc_sm_rget_accumulate(void *origin_addr,
153-
int origin_count,
152+
ompi_osc_sm_rget_accumulate(const void *origin_addr,
153+
int origin_count,
154154
struct ompi_datatype_t *origin_dt,
155155
void *result_addr,
156156
int result_count,
@@ -185,7 +185,7 @@ ompi_osc_sm_rget_accumulate(void *origin_addr,
185185
if (OMPI_SUCCESS != ret || op == &ompi_mpi_op_no_op.op) goto done;
186186

187187
if (op == &ompi_mpi_op_replace.op) {
188-
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
188+
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
189189
remote_address, target_count, target_dt);
190190
} else {
191191
ret = ompi_osc_base_sndrcv_op(origin_addr, origin_count, origin_dt,
@@ -206,7 +206,7 @@ ompi_osc_sm_rget_accumulate(void *origin_addr,
206206

207207

208208
int
209-
ompi_osc_sm_put(void *origin_addr,
209+
ompi_osc_sm_put(const void *origin_addr,
210210
int origin_count,
211211
struct ompi_datatype_t *origin_dt,
212212
int target,
@@ -229,7 +229,7 @@ ompi_osc_sm_put(void *origin_addr,
229229

230230
remote_address = ((char*) (module->bases[target])) + module->disp_units[target] * target_disp;
231231

232-
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
232+
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
233233
remote_address, target_count, target_dt);
234234

235235
return ret;
@@ -268,7 +268,7 @@ ompi_osc_sm_get(void *origin_addr,
268268

269269

270270
int
271-
ompi_osc_sm_accumulate(void *origin_addr,
271+
ompi_osc_sm_accumulate(const void *origin_addr,
272272
int origin_count,
273273
struct ompi_datatype_t *origin_dt,
274274
int target,
@@ -295,7 +295,7 @@ ompi_osc_sm_accumulate(void *origin_addr,
295295

296296
opal_atomic_lock(&module->node_states[target].accumulate_lock);
297297
if (op == &ompi_mpi_op_replace.op) {
298-
ret = ompi_datatype_sndrcv(origin_addr, origin_count, origin_dt,
298+
ret = ompi_datatype_sndrcv((void *)origin_addr, origin_count, origin_dt,
299299
remote_address, target_count, target_dt);
300300
} else {
301301
ret = ompi_osc_base_sndrcv_op(origin_addr, origin_count, origin_dt,

‎ompi/mpi/c/accumulate.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Copyright (c) 2009 Sun Microsystmes, Inc. All rights reserved.
1414
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16+
* Copyright (c) 2015 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1618
* $COPYRIGHT$
1719
*
1820
* Additional copyrights may follow
@@ -126,8 +128,7 @@ int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origi
126128

127129
OPAL_CR_ENTER_LIBRARY();
128130

129-
/* XXX -- CONST -- do not cast away const -- update mca/osc */
130-
rc = ompi_win->w_osc_module->osc_accumulate((void *) origin_addr,
131+
rc = ompi_win->w_osc_module->osc_accumulate(origin_addr,
131132
origin_count,
132133
origin_datatype,
133134
target_rank,

‎ompi/mpi/c/get_accumulate.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* Copyright (c) 2011 Sandia National Laboratories. All rights reserved.
1515
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
1616
* reserved.
17+
* Copyright (c) 2015 Research Organization for Information Science
18+
* and Technology (RIST). All rights reserved.
1719
* $COPYRIGHT$
1820
*
1921
* Additional copyrights may follow
@@ -133,8 +135,7 @@ int MPI_Get_accumulate(const void *origin_addr, int origin_count, MPI_Datatype o
133135

134136
OPAL_CR_ENTER_LIBRARY();
135137

136-
/* XXX -- TODO: do not cast away the const */
137-
rc = ompi_win->w_osc_module->osc_get_accumulate((void *) origin_addr,
138+
rc = ompi_win->w_osc_module->osc_get_accumulate(origin_addr,
138139
origin_count,
139140
origin_datatype,
140141
result_addr,

‎ompi/mpi/c/put.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Copyright (c) 2006 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16+
* Copyright (c) 2015 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1618
* $COPYRIGHT$
1719
*
1820
* Additional copyrights may follow
@@ -77,8 +79,7 @@ int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datat
7779

7880
OPAL_CR_ENTER_LIBRARY();
7981

80-
/* XXX -- CONST -- do not cast away const -- update mca/osc */
81-
rc = win->w_osc_module->osc_put((void *) origin_addr, origin_count, origin_datatype,
82+
rc = win->w_osc_module->osc_put(origin_addr, origin_count, origin_datatype,
8283
target_rank, target_disp, target_count,
8384
target_datatype, win);
8485
OMPI_ERRHANDLER_RETURN(rc, win, rc, FUNC_NAME);

0 commit comments

Comments
 (0)