From 0ac74c5f97681e942f42da15dabba858296c5697 Mon Sep 17 00:00:00 2001
From: John Romein <romein@astron.nl>
Date: Sat, 12 Jul 2008 14:27:57 +0000
Subject: [PATCH] bug 225: BG/P changes
---
Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc | 8 ++++----
Appl/CEP/CS1/CS1_BGLProc/src/Makefile.am | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc b/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
index 510a5d685d7..ec0f1d7295f 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
+++ b/Appl/CEP/CS1/CS1_BGLProc/src/CS1_BGL_Processing_main.cc
@@ -64,13 +64,16 @@ int main(int argc, char **argv)
TH_ZoidClient th;
#elif 0
TH_Null th;
-#elif 0
+#elif 1
usleep(10000 * locationInfo.rankInPset()); // do not connect all at the same time
+ std::clog << "creating connection ..." << std::endl;
TH_Socket th("127.0.0.1", boost::lexical_cast<string>(5000 + locationInfo.rankInPset()));
+ std::clog << "waiting for connection ..." << std::endl;
while (!th.init())
sleep(1);
+ std::clog << "connection successful" << std::endl;
#else
TH_File th(string("/tmp/sock.") + boost::lexical_cast<string>(locationInfo.rankInPset()), TH_File::Read);
@@ -82,10 +85,8 @@ int main(int argc, char **argv)
BGL_Command command;
do {
-std::clog << TH_MPI::getCurrentRank() << " read command" << std::endl;
command.read(&th);
-std::clog << TH_MPI::getCurrentRank() << " received command " << (unsigned) command.value() << std::endl;
switch (command.value()) {
case BGL_Command::PREPROCESS : {
BGL_Configuration configuration;
@@ -103,7 +104,6 @@ std::clog << TH_MPI::getCurrentRank() << " received command " << (unsigned) comm
default : break;
}
-std::clog << TH_MPI::getCurrentRank() << " command handled" << std::endl;
} while (command.value() != BGL_Command::STOP);
#if defined HAVE_MPI
diff --git a/Appl/CEP/CS1/CS1_BGLProc/src/Makefile.am b/Appl/CEP/CS1/CS1_BGLProc/src/Makefile.am
index 108ab8d887a..08029653081 100644
--- a/Appl/CEP/CS1/CS1_BGLProc/src/Makefile.am
+++ b/Appl/CEP/CS1/CS1_BGLProc/src/Makefile.am
@@ -29,7 +29,6 @@ DOCHDRS = $(INSTHDRS) $(NOINSTHDRS)
bin_PROGRAMS = CS1_BGL_Processing
-CCAS = $(CC)
CCASFLAGS = $(patsubst -q%,,$(CPPFLAGS)) $(EXTRA_CPPFLAGS)
CS1_BGL_Processing_SOURCES = $(DOCHDRS) \
--
GitLab