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
Don't create structures for 0 sized datatypes
[simgrid.git]
/
src
/
smpi
/
smpi_bench.cpp
diff --git
a/src/smpi/smpi_bench.cpp
b/src/smpi/smpi_bench.cpp
index 00ded922f08fcb47a4ef7c8f16a87290852810dd..0f1578e13f78198780f59c5879ff7c25010a773e 100644
(file)
--- a/
src/smpi/smpi_bench.cpp
+++ b/
src/smpi/smpi_bench.cpp
@@
-261,9
+261,8
@@
void smpi_bench_end(void)
xbt_die("Aborting.");
}
// Simulate the benchmarked computation unless disabled via command-line argument
xbt_die("Aborting.");
}
// Simulate the benchmarked computation unless disabled via command-line argument
- if (
sg_cfg_get_boolean("smpi/simulate_computation")) {
+ if (
xbt_cfg_get_boolean("smpi/simulate-computation"))
smpi_execute(xbt_os_timer_elapsed(timer));
smpi_execute(xbt_os_timer_elapsed(timer));
- }
smpi_total_benched_time += xbt_os_timer_elapsed(timer);
}
smpi_total_benched_time += xbt_os_timer_elapsed(timer);
}
@@
-481,7
+480,7
@@
void smpi_sample_3(int global, const char *file, int line)
void *smpi_shared_malloc(size_t size, const char *file, int line)
{
void* mem;
void *smpi_shared_malloc(size_t size, const char *file, int line)
{
void* mem;
- if (
sg_cfg_get_boolean("smpi/use_shared_
malloc")){
+ if (
xbt_cfg_get_boolean("smpi/use-shared-
malloc")){
int fd;
smpi_source_location loc(file, line);
auto res = allocs.insert(std::make_pair(loc, shared_data_t()));
int fd;
smpi_source_location loc(file, line);
auto res = allocs.insert(std::make_pair(loc, shared_data_t()));
@@
-497,7
+496,7
@@
void *smpi_shared_malloc(size_t size, const char *file, int line)
case EEXIST:
xbt_die("Please cleanup /dev/shm/%s", shmname);
default:
case EEXIST:
xbt_die("Please cleanup /dev/shm/%s", shmname);
default:
- xbt_die("An unhandled error occured while opening %s. shm_open: %s", shmname, strerror(errno));
+ xbt_die("An unhandled error occur
r
ed while opening %s. shm_open: %s", shmname, strerror(errno));
}
}
data->second.fd = fd;
}
}
data->second.fd = fd;
@@
-524,7
+523,7
@@
void smpi_shared_free(void *ptr)
{
char loc[PTR_STRLEN];
{
char loc[PTR_STRLEN];
- if (
sg_cfg_get_boolean("smpi/use_shared_
malloc")){
+ if (
xbt_cfg_get_boolean("smpi/use-shared-
malloc")){
snprintf(loc, PTR_STRLEN, "%p", ptr);
auto meta = allocs_metadata.find(ptr);
if (meta == allocs_metadata.end()) {
snprintf(loc, PTR_STRLEN, "%p", ptr);
auto meta = allocs_metadata.find(ptr);
if (meta == allocs_metadata.end()) {