[GNUnet-SVN] r24838 - in gnunet: . po src src/consensus src/testbed

[gnunet]

Author: grothoff
Date: 2012-11-08 14:03:19 +0100 (Thu, 08 Nov 2012)
New Revision: 24838

Added:
   gnunet/src/consensus/
   gnunet/src/consensus/Makefile.am
   gnunet/src/consensus/consensus.conf.in
   gnunet/src/consensus/gnunet-service-consensus.cc
Modified:
   gnunet/configure.ac
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/Makefile.am
   gnunet/src/testbed/gnunet-testbed-profiler.c
Log:
-starting build system for consensus

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/configure.ac 2012-11-08 13:03:19 UTC (rev 24838)
@@ -1155,6 +1155,8 @@
 src/chat/chat.conf
 src/core/Makefile
 src/core/core.conf
+src/consensus/Makefile
+src/consensus/consensus.conf
 src/datacache/Makefile
 src/datastore/Makefile
 src/datastore/datastore.conf

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/po/de.po     2012-11-08 13:03:19 UTC (rev 24838)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -3577,24 +3577,24 @@
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/po/es.po     2012-11-08 13:03:19 UTC (rev 24838)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -3563,24 +3563,24 @@
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/po/sv.po     2012-11-08 13:03:19 UTC (rev 24838)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -3511,24 +3511,24 @@
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/po/vi.po     2012-11-08 13:03:19 UTC (rev 24838)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -3576,24 +3576,24 @@
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/po/zh_CN.po  2012-11-08 13:03:19 UTC (rev 24838)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 22:09+0100\n"
+"POT-Creation-Date: 2012-11-05 22:48+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -3370,24 +3370,24 @@
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8038
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8238
+#: src/mesh/gnunet-service-mesh.c:8243
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8327 src/mesh/gnunet-service-mesh.c:8339
-#: src/mesh/gnunet-service-mesh.c:8351 src/mesh/gnunet-service-mesh.c:8364
-#: src/mesh/gnunet-service-mesh.c:8379 src/mesh/gnunet-service-mesh.c:8391
-#: src/mesh/gnunet-service-mesh.c:8403
+#: src/mesh/gnunet-service-mesh.c:8332 src/mesh/gnunet-service-mesh.c:8344
+#: src/mesh/gnunet-service-mesh.c:8356 src/mesh/gnunet-service-mesh.c:8369
+#: src/mesh/gnunet-service-mesh.c:8384 src/mesh/gnunet-service-mesh.c:8396
+#: src/mesh/gnunet-service-mesh.c:8408
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:8415 src/mesh/gnunet-service-mesh.c:8426
+#: src/mesh/gnunet-service-mesh.c:8420 src/mesh/gnunet-service-mesh.c:8431
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2012-11-08 12:25:12 UTC (rev 24837)
+++ gnunet/src/Makefile.am      2012-11-08 13:03:19 UTC (rev 24838)
@@ -3,7 +3,7 @@
 #endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = chat dv 
+ EXP_DIR = chat dv consensus
 endif
 
 if LINUX

Added: gnunet/src/consensus/Makefile.am
===================================================================
--- gnunet/src/consensus/Makefile.am                            (rev 0)
+++ gnunet/src/consensus/Makefile.am    2012-11-08 13:03:19 UTC (rev 24838)
@@ -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  
+

Added: gnunet/src/consensus/consensus.conf.in
===================================================================
--- gnunet/src/consensus/consensus.conf.in                              (rev 0)
+++ gnunet/src/consensus/consensus.conf.in      2012-11-08 13:03:19 UTC (rev 
24838)
@@ -0,0 +1,11 @@
+[consensus]
+AUTOSTART = YES
address@hidden@ 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

Added: gnunet/src/consensus/gnunet-service-consensus.cc
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.cc                            
(rev 0)
+++ gnunet/src/consensus/gnunet-service-consensus.cc    2012-11-08 13:03:19 UTC 
(rev 24838)
@@ -0,0 +1,10 @@
+#include <cstdio>
+#include <iostream>
+
+using namespace std;
+
+int main ()
+{
+  cout << "Hello world" << endl;
+  return 0;
+}

Modified: gnunet/src/testbed/gnunet-testbed-profiler.c
===================================================================
--- gnunet/src/testbed/gnunet-testbed-profiler.c        2012-11-08 12:25:12 UTC 
(rev 24837)
+++ gnunet/src/testbed/gnunet-testbed-profiler.c        2012-11-08 13:03:19 UTC 
(rev 24838)
@@ -297,9 +297,6 @@
 }
 
 
-
-
-
 /**
  * Functions of this signature are called when a peer has been successfully
  * started or stopped.
@@ -335,7 +332,9 @@
     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 @@
     {
       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;