cosmetics: rename alltoall to all2all

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2246 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/configure.ac b/configure.ac
index faf44ff..6ca5d44 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,7 @@ AC_CONFIG_FILES([
       examples/gras/chrono/Makefile examples/gras/chrono/test_sg examples/gras/chrono/test_rl
       examples/gras/tokenS/Makefile examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl
       examples/gras/mmrpc/Makefile examples/gras/mmrpc/test_sg examples/gras/mmrpc/test_rl
+      examples/gras/all2all/Makefile examples/gras/all2all/test_sg examples/gras/all2all/test_rl
 
       examples/gras/p2p/Makefile
       examples/gras/p2p/chord/Makefile examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl
@@ -298,6 +299,7 @@ AC_CONFIG_FILES([
      examples/gras/chrono/test_sg examples/gras/chrono/test_rl  \
      examples/gras/tokenS/test_sg examples/gras/tokenS/test_rl  \
      examples/gras/mmrpc/test_sg  examples/gras/mmrpc/test_rl   \
+     examples/gras/all2all/test_sg  examples/gras/all2all/test_rl   \
      examples/gras/p2p/chord/test_sg examples/gras/p2p/chord/test_rl  \
      examples/gras/p2p/can/test_sg   examples/gras/p2p/can/test_rl  \
      examples/msg/run_msg_test                                  \

diff --git a/examples/gras/alltoall/.cvsignore b/examples/gras/all2all/.cvsignore
similarity index 82%
rename from examples/gras/alltoall/.cvsignore
rename to examples/gras/all2all/.cvsignore
index 9251c8a..b2e8550 100644 (file)
--- a/examples/gras/alltoall/.cvsignore
+++ b/examples/gras/all2all/.cvsignore
@@ -1,4 +1,4 @@
-alltoall_node *_simulator
+all2all_node *_simulator
 .deps .libs Makefile Makefile.in _*.c 
 test_sg test_rl
 *.Makefile.am *.Makefile.local *.Makefile.remote

diff --git a/examples/gras/all2all/Makefile.am b/examples/gras/all2all/Makefile.am
new file mode 100644 (file)
index 0000000..99ecd5c
--- /dev/null
+++ b/examples/gras/all2all/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES= -I$(top_srcdir)/include
+TESTS= test_rl test_sg
+EXTRA_DIST=all2all_deployment.xml $(TESTS)
+
+# AUTOMAKE variable definition
+noinst_PROGRAMS=all2all_node all2all_simulator
+
+all2all_simulator_SOURCES=     _all2all_simulator.c all2all.c 
+all2all_simulator_LDADD=       $(top_builddir)/src/libsimgrid.la
+
+all2all_node_SOURCES=  _all2all_node.c all2all.c
+all2all_node_LDADD=    $(top_builddir)/src/libgras.la
+
+# Take care of generatated sources
+NAME=all2all
+PROCESSES= node
+include $(top_srcdir)/examples/temps-gras-stub.mk
+
+# Cruft
+include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/alltoall/alltoall.c b/examples/gras/all2all/all2all.c
similarity index 96%
rename from examples/gras/alltoall/alltoall.c
rename to examples/gras/all2all/all2all.c
index 1136067..1727a0c 100644 (file)
--- a/examples/gras/alltoall/alltoall.c
+++ b/examples/gras/all2all/all2all.c
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-/* ALLTOALL - alltoall of GRAS features                         */
+/* ALL2ALL - all2all of GRAS features                                       */
 
-/* Copyright (c) 2006 Ahmed Harbaoui. All rights reserved.      */
+/* Copyright (c) 2006 Ahmed Harbaoui. 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. */
@@ -10,7 +10,7 @@
 #include "gras.h"
 #include "xbt/ex.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(alltoall,"Messages specific to this example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(all2all,"Messages specific to this example");
 
 /* register data which may be sent (common to client and server) */
 static void register_messages(void) {

diff --git a/examples/gras/alltoall/alltoall_deployment.xml b/examples/gras/all2all/all2all_deployment.xml
similarity index 100%
rename from examples/gras/alltoall/alltoall_deployment.xml
rename to examples/gras/all2all/all2all_deployment.xml

diff --git a/examples/gras/alltoall/test_rl.in b/examples/gras/all2all/test_rl.in
similarity index 66%
rename from examples/gras/alltoall/test_rl.in
rename to examples/gras/all2all/test_rl.in
index 3e325f5..f0eb5a0 100755 (executable)
--- a/examples/gras/alltoall/test_rl.in
+++ b/examples/gras/all2all/test_rl.in
@@ -6,6 +6,6 @@ else
   exenv=wine
 fi
     
-$exenv ./ping_server@EXEEXT@ 4002 $@ &
+$exenv ./all2all_server@EXEEXT@ 4002 $@ &
 sleep 1
-$exenv ./ping_client@EXEEXT@ 127.0.0.1 4002 $@
+$exenv ./all2all_client@EXEEXT@ 127.0.0.1 4002 $@

diff --git a/examples/gras/all2all/test_sg.in b/examples/gras/all2all/test_sg.in
new file mode 100755 (executable)
index 0000000..5214e62
--- /dev/null
+++ b/examples/gras/all2all/test_sg.in
@@ -0,0 +1,9 @@
+#! @BASH@
+if [ x@EXEEXT@ = x ] ; then 
+  exenv=$SG_TEST_EXENV
+else
+  exenv=wine
+fi
+
+exec $exenv ./all2all_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/alltoall_deployment.xml $@
+

diff --git a/examples/gras/alltoall/Makefile.am b/examples/gras/alltoall/Makefile.am
deleted file mode 100644 (file)
index 801c3f5..0000000
--- a/examples/gras/alltoall/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-INCLUDES= -I$(top_srcdir)/include
-TESTS= test_rl test_sg
-EXTRA_DIST=alltoall_deployment.xml $(TESTS)
-
-# AUTOMAKE variable definition
-noinst_PROGRAMS=alltoall_node alltoall_simulator
-
-alltoall_simulator_SOURCES=    _alltoall_simulator.c alltoall.c 
-alltoall_simulator_LDADD=      $(top_builddir)/src/libsimgrid.la
-
-alltoall_node_SOURCES= _alltoall_node.c alltoall.c
-alltoall_node_LDADD=   $(top_builddir)/src/libgras.la
-
-# Take care of generatated sources
-NAME=alltoall
-PROCESSES= node
-include $(top_srcdir)/examples/temps-gras-stub.mk
-
-# Cruft
-include $(top_srcdir)/acmacro/dist-files.mk

diff --git a/examples/gras/alltoall/test_sg.in b/examples/gras/alltoall/test_sg.in
deleted file mode 100755 (executable)
index 0a9ca61..0000000
--- a/examples/gras/alltoall/test_sg.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#! @BASH@
-if [ x@EXEEXT@ = x ] ; then 
-  exenv=$SG_TEST_EXENV
-else
-  exenv=wine
-fi
-
-exec $exenv ./alltoall_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/alltoall_deployment.xml $@
-