Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / colls / bcast-arrival-scatter.c

diff --git a/src/smpi/colls/bcast-arrival-scatter.c b/src/smpi/colls/bcast-arrival-scatter.c
index 609490d..ff7b10b 100644 (file)
--- a/src/smpi/colls/bcast-arrival-scatter.c
+++ b/src/smpi/colls/bcast-arrival-scatter.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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 "colls_private.h"
 
 #ifndef BCAST_ARRIVAL_PATTERN_AWARE_HEADER_SIZE
@@ -186,12 +192,9 @@ int smpi_coll_tuned_bcast_arrival_scatter(void *buf, int count,
              0, tag, comm, &status);
 
     /* at this point all nodes in this set perform all-gather operation */
-    to = header_buf[myordering + 1];
-    from = header_buf[myordering - 1];
-    if (myordering == 0)
-      from = header_buf[total_nodes - 1];
-    if (myordering == (total_nodes - 1))
-      to = header_buf[0];
+    
+    to = (myordering == (total_nodes - 1)) ? header_buf[0] : header_buf[myordering + 1];
+    from = (myordering == 0) ? header_buf[total_nodes - 1] : header_buf[myordering - 1];
 
 
     /* last segment may have a larger size since it also include the remainder */