A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add time injection in MPI_Wtime and MPI_Test, to match what was done in iprobe
[simgrid.git]
/
src
/
smpi
/
smpi_mpi_dt_private.h
diff --git
a/src/smpi/smpi_mpi_dt_private.h
b/src/smpi/smpi_mpi_dt_private.h
index
23af198
..
c88b436
100644
(file)
--- a/
src/smpi/smpi_mpi_dt_private.h
+++ b/
src/smpi/smpi_mpi_dt_private.h
@@
-1,10
+1,10
@@
/* smpi_mpi_dt_private.h -- functions of smpi_mpi_dt.c that are exported to other SMPI modules. */
/* smpi_mpi_dt_private.h -- functions of smpi_mpi_dt.c that are exported to other SMPI modules. */
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2010, 2012-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
-
* under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef SMPI_DT_PRIVATE_H
#define SMPI_DT_PRIVATE_H
#ifndef SMPI_DT_PRIVATE_H
#define SMPI_DT_PRIVATE_H
@@
-45,16
+45,16
@@
typedef struct s_smpi_mpi_contiguous{
MPI_Datatype old_type;
MPI_Aint lb;
size_t size_oldtype;
MPI_Datatype old_type;
MPI_Aint lb;
size_t size_oldtype;
-
size_
t block_count;
+
in
t block_count;
} s_smpi_mpi_contiguous_t;
typedef struct s_smpi_mpi_vector{
s_smpi_subtype_t base;
MPI_Datatype old_type;
size_t size_oldtype;
} s_smpi_mpi_contiguous_t;
typedef struct s_smpi_mpi_vector{
s_smpi_subtype_t base;
MPI_Datatype old_type;
size_t size_oldtype;
-
size_
t block_stride;
-
size_
t block_length;
-
size_
t block_count;
+
in
t block_stride;
+
in
t block_length;
+
in
t block_count;
} s_smpi_mpi_vector_t;
typedef struct s_smpi_mpi_hvector{
} s_smpi_mpi_vector_t;
typedef struct s_smpi_mpi_hvector{
@@
-62,8
+62,8
@@
typedef struct s_smpi_mpi_hvector{
MPI_Datatype old_type;
size_t size_oldtype;
MPI_Aint block_stride;
MPI_Datatype old_type;
size_t size_oldtype;
MPI_Aint block_stride;
-
size_
t block_length;
-
size_
t block_count;
+
in
t block_length;
+
in
t block_count;
} s_smpi_mpi_hvector_t;
typedef struct s_smpi_mpi_indexed{
} s_smpi_mpi_hvector_t;
typedef struct s_smpi_mpi_indexed{
@@
-72,7
+72,7
@@
typedef struct s_smpi_mpi_indexed{
size_t size_oldtype;
int* block_lengths;
int* block_indices;
size_t size_oldtype;
int* block_lengths;
int* block_indices;
-
size_
t block_count;
+
in
t block_count;
} s_smpi_mpi_indexed_t;
typedef struct s_smpi_mpi_hindexed{
} s_smpi_mpi_indexed_t;
typedef struct s_smpi_mpi_hindexed{
@@
-81,7
+81,7
@@
typedef struct s_smpi_mpi_hindexed{
size_t size_oldtype;
int* block_lengths;
MPI_Aint* block_indices;
size_t size_oldtype;
int* block_lengths;
MPI_Aint* block_indices;
-
size_
t block_count;
+
in
t block_count;
} s_smpi_mpi_hindexed_t;
typedef struct s_smpi_mpi_struct{
} s_smpi_mpi_hindexed_t;
typedef struct s_smpi_mpi_struct{
@@
-90,7
+90,7
@@
typedef struct s_smpi_mpi_struct{
size_t size_oldtype;
int* block_lengths;
MPI_Aint* block_indices;
size_t size_oldtype;
int* block_lengths;
MPI_Aint* block_indices;
-
size_
t block_count;
+
in
t block_count;
MPI_Datatype* old_types;
} s_smpi_mpi_struct_t;
MPI_Datatype* old_types;
} s_smpi_mpi_struct_t;
@@
-100,12
+100,13
@@
typedef struct s_smpi_mpi_struct{
*/
void unserialize_contiguous( const void *contiguous_vector,
void *noncontiguous_vector,
*/
void unserialize_contiguous( const void *contiguous_vector,
void *noncontiguous_vector,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_contiguous( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_contiguous( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_contiguous(MPI_Datatype* type);
void *type);
void free_contiguous(MPI_Datatype* type);
@@
-117,12
+118,13
@@
s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb,
void unserialize_vector( const void *contiguous_vector,
void *noncontiguous_vector,
void unserialize_vector( const void *contiguous_vector,
void *noncontiguous_vector,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_vector( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_vector( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_vector(MPI_Datatype* type);
void *type);
void free_vector(MPI_Datatype* type);
@@
-135,12
+137,13
@@
s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride,
void unserialize_hvector( const void *contiguous_vector,
void *noncontiguous_vector,
void unserialize_hvector( const void *contiguous_vector,
void *noncontiguous_vector,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_hvector( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_hvector( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_hvector(MPI_Datatype* type);
void *type);
void free_hvector(MPI_Datatype* type);
@@
-154,12
+157,13
@@
s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride,
void unserialize_indexed( const void *contiguous_indexed,
void *noncontiguous_indexed,
void unserialize_indexed( const void *contiguous_indexed,
void *noncontiguous_indexed,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_indexed( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_indexed( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_indexed(MPI_Datatype* type);
void *type);
void free_indexed(MPI_Datatype* type);
@@
-172,12
+176,13
@@
s_smpi_mpi_indexed_t* smpi_datatype_indexed_create(int* block_lengths,
void unserialize_hindexed( const void *contiguous_indexed,
void *noncontiguous_indexed,
void unserialize_hindexed( const void *contiguous_indexed,
void *noncontiguous_indexed,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_hindexed( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_hindexed( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_hindexed(MPI_Datatype* type);
void *type);
void free_hindexed(MPI_Datatype* type);
@@
-190,12
+195,13
@@
s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create(int* block_lengths,
void unserialize_struct( const void *contiguous_indexed,
void *noncontiguous_indexed,
void unserialize_struct( const void *contiguous_indexed,
void *noncontiguous_indexed,
- size_t count,
- void *type);
+ int count,
+ void *type,
+ MPI_Op op);
void serialize_struct( const void *noncontiguous_vector,
void *contiguous_vector,
void serialize_struct( const void *noncontiguous_vector,
void *contiguous_vector,
-
size_
t count,
+
in
t count,
void *type);
void free_struct(MPI_Datatype* type);
void *type);
void free_struct(MPI_Datatype* type);