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
[mc] Fix type conversion
[simgrid.git]
/
include
/
smpi
/
smpi.h
diff --git
a/include/smpi/smpi.h
b/include/smpi/smpi.h
index
be167eb
..
5fd5a7c
100644
(file)
--- a/
include/smpi/smpi.h
+++ b/
include/smpi/smpi.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
3
. The SimGrid Team.
+/* Copyright (c) 2007-201
4
. 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
@@
-41,12
+41,10
@@
SG_BEGIN_DECL()
#define SMPI_RAND_SEED 5
#define MPI_ANY_SOURCE -555
#define MPI_BOTTOM (void *)-111
#define SMPI_RAND_SEED 5
#define MPI_ANY_SOURCE -555
#define MPI_BOTTOM (void *)-111
-#define MPI_FORTRAN_BOTTOM -111
#define MPI_PROC_NULL -666
#define MPI_ANY_TAG -444
#define MPI_UNDEFINED -333
#define MPI_IN_PLACE (void *)-222
#define MPI_PROC_NULL -666
#define MPI_ANY_TAG -444
#define MPI_UNDEFINED -333
#define MPI_IN_PLACE (void *)-222
-#define MPI_FORTRAN_IN_PLACE -222
// errorcodes
#define MPI_SUCCESS 0
// errorcodes
#define MPI_SUCCESS 0
@@
-167,8
+165,6
@@
typedef struct {
#define MPI_STATUS_IGNORE ((MPI_Status*)NULL)
#define MPI_STATUSES_IGNORE ((MPI_Status*)NULL)
#define MPI_STATUS_IGNORE ((MPI_Status*)NULL)
#define MPI_STATUSES_IGNORE ((MPI_Status*)NULL)
-#define MPI_FORTRAN_STATUS_IGNORE -1
-#define MPI_FORTRAN_STATUSES_IGNORE -1
#define MPI_DATATYPE_NULL ((MPI_Datatype)NULL)
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_CHAR;
#define MPI_DATATYPE_NULL ((MPI_Datatype)NULL)
XBT_PUBLIC_DATA( MPI_Datatype ) MPI_CHAR;
@@
-677,6
+673,7
@@
MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_parent,( MPI_Comm *parent));
//FIXME: End of all the not yet implemented stuff
// smpi functions
//FIXME: End of all the not yet implemented stuff
// smpi functions
+XBT_PUBLIC(int) smpi_global_size(void);
XBT_PUBLIC(MPI_Comm) smpi_process_comm_self(void);
/*
XBT_PUBLIC(void) smpi_exit(int);
XBT_PUBLIC(MPI_Comm) smpi_process_comm_self(void);
/*
XBT_PUBLIC(void) smpi_exit(int);
@@
-685,15
+682,11
@@
XBT_PUBLIC(void) smpi_exit(int);
XBT_PUBLIC(void) smpi_execute_flops(double flops);
XBT_PUBLIC(void) smpi_execute(double duration);
XBT_PUBLIC(void) smpi_execute_flops(double flops);
XBT_PUBLIC(void) smpi_execute(double duration);
-XBT_PUBLIC(double) smpi_get_host_current_power_peak_(void);
-XBT_PUBLIC(int) smpi_get_host_nb_pstates_(void);
-XBT_PUBLIC(double) smpi_get_host_consumed_energy_(void);
-
XBT_PUBLIC(double) smpi_get_host_power_peak_at(int pstate_index);
XBT_PUBLIC(double) smpi_get_host_power_peak_at(int pstate_index);
-#define smpi_get_host_current_power_peak() smpi_get_host_current_power_peak_()
-#define smpi_get_host_nb_pstates() smpi_get_host_nb_pstates_()
+XBT_PUBLIC(double) smpi_get_host_current_power_peak(void);
+XBT_PUBLIC(int) smpi_get_host_nb_pstates(void);
XBT_PUBLIC(void) smpi_set_host_power_peak_at(int pstate_index);
XBT_PUBLIC(void) smpi_set_host_power_peak_at(int pstate_index);
-#define smpi_get_host_consumed_energy() smpi_get_host_consumed_energy_()
+XBT_PUBLIC(double) smpi_get_host_consumed_energy(void);
XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs);
XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv);
XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs);
XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv);