-
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2016. The SimGrid Team. 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. */
+#include <simgrid/s4u/host.hpp>
#include <xbt/ex.hpp>
#include "private.h"
} else {
if (n == 0) {
*newgroup = group;
- if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL
+ if (group != smpi_comm_group(MPI_COMM_WORLD)
&& group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY)
smpi_group_use(group);
} else if (n == smpi_group_size(group)) {
} else {
if (n == 0) {
*newgroup = group;
- if(group!= smpi_comm_group(MPI_COMM_WORLD) && group != MPI_GROUP_NULL
+ if (group!= smpi_comm_group(MPI_COMM_WORLD)
&& group != smpi_comm_group(MPI_COMM_SELF) && group != MPI_GROUP_EMPTY)
smpi_group_use(group);
} else {
smpi_empty_status(status);
retval = MPI_SUCCESS;
} else {
- int rank = (request!=nullptr && (*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1;
+ int rank = ((*request)->comm != MPI_COMM_NULL) ? smpi_process_index() : -1;
instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
extra->type = TRACING_TEST;
{
int retval = MPI_SUCCESS;
- strncpy(name, sg_host_get_name(SIMIX_host_self()),
- strlen(sg_host_get_name(SIMIX_host_self())) < MPI_MAX_PROCESSOR_NAME - 1 ?
- strlen(sg_host_get_name(SIMIX_host_self())) +1 : MPI_MAX_PROCESSOR_NAME - 1 );
+ strncpy(name, SIMIX_host_self()->cname(), strlen(SIMIX_host_self()->cname()) < MPI_MAX_PROCESSOR_NAME - 1
+ ? strlen(SIMIX_host_self()->cname()) + 1
+ : MPI_MAX_PROCESSOR_NAME - 1);
*resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
return retval;