-starting build system for consensus

5 files changed, 75 insertions, 5 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 503b25a45..08b93efb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 #endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv 
+ EXP_DIR = chat dv consensus
 endif
 
 if LINUX
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
new file mode 100644
index 000000000..2041ec1ac
--- /dev/null
+++ b/src/consensus/Makefile.am
@@ -0,0 +1,48 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  consensus.conf
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+#bin_PROGRAMS = \
+# gnunet-consensus 
+
+libexec_PROGRAMS = \
+ gnunet-service-consensus
+
+#gnunet_consensus_SOURCES = \
+# gnunet-consensus.c         
+#gnunet_consensus_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la \
+#  $(GN_LIBINTL)
+
+gnunet_service_consensus_SOURCES = \
+ gnunet-service-consensus.cc
+gnunet_service_consensus_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(GN_LIBINTL) 
+
+
+#check_PROGRAMS = \
+# test_consensus_api
+
+#if ENABLE_TEST_RUN
+#TESTS = $(check_PROGRAMS)
+#endif
+#
+#test_consensus_api_SOURCES = \
+# test_consensus_api.c
+#test_consensus_api_LDADD = \
+#  $(top_builddir)/src/util/libgnunetutil.la  
+
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
new file mode 100644
index 000000000..18e976deb
--- /dev/null
+++ b/src/consensus/consensus.conf.in
@@ -0,0 +1,11 @@
+[consensus]
+AUTOSTART = YES
+@UNIXONLY@ PORT = 2103
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+BINARY = gnunet-service-consensus
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-consensus.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
diff --git a/src/consensus/gnunet-service-consensus.cc b/src/consensus/gnunet-service-consensus.cc
new file mode 100644
index 000000000..d5e829e51
--- /dev/null
+++ b/src/consensus/gnunet-service-consensus.cc
@@ -0,0 +1,10 @@
+#include <cstdio>
+#include <iostream>
+
+using namespace std;
+
+int main ()
+{
+  cout << "Hello world" << endl;
+  return 0;
+}
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 99efa6741..9bfeaddd2 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -297,9 +297,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-
-
-
 /**
  * Functions of this signature are called when a peer has been successfully
  * started or stopped.
@@ -335,7 +332,9 @@ peer_churn_cb (void *cls, const char *emsg)
     fflush (stdout);
     result = GNUNET_OK;
     if ((0 == num_links) && (topology == GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI))
-    {      
+    { 
+      fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n");
+      (void) getc (stdin);
       shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
       return;
     }
@@ -562,6 +561,8 @@ controller_event_cb (void *cls,
     {
       print_overlay_links_summary ();
       result = GNUNET_OK;
+      fprintf (stdout, "Testbed running, waiting for keystroke to shut down\n");
+      (void) getc (stdin);
       shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
     }    
     break;