[GNUnet-SVN] r28219 - in msh: . src

[gnunet]

Author: harsha
Date: 2013-07-20 23:04:11 +0200 (Sat, 20 Jul 2013)
New Revision: 28219

Modified:
   msh/configure.ac
   msh/src/Makefile.am
   msh/src/addressmap.c
   msh/src/addressmap.h
   msh/src/mshd.c
   msh/src/reduce.c
Log:
- checkpoint save


Modified: msh/configure.ac
===================================================================
--- msh/configure.ac    2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/configure.ac    2013-07-20 21:04:11 UTC (rev 28219)
@@ -16,7 +16,8 @@
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdlib.h string.h unistd.h netinet/in.h net/if.h ifaddrs.h \
-sys/socket.h sys/select.h sys/time.h sys/types.h error.h errno.h limits.h],,
+sys/socket.h sys/select.h sys/time.h sys/types.h error.h errno.h limits.h \
+regex.h time.h],,
  [AC_MSG_ERROR([a required standard UNIX header is missing])])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -24,7 +25,9 @@
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([strdup strerror getnameinfo getifaddrs freeifaddrs],,
+AC_CHECK_FUNCS([strdup strlen strerror strcmp getnameinfo getifaddrs 
freeifaddrs \
+printf fprintf snprintf vsnprintf memset gettimeofday localtime strftime \
+getpid getcwd],,
                [AC_MSG_ERROR([a required C library function is missing])])
 
 # test for math functions
@@ -78,6 +81,10 @@
  AC_MSG_ERROR([MSH requires libevent])
 fi
 
+dnl have all messages as of now
+extra_logging=1;
+AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging 
is enabled, 2 for very verbose extra logging, 0 otherwise])
+
 AC_CONFIG_FILES([Makefile
                src/Makefile])
 AC_OUTPUT

Modified: msh/src/Makefile.am
===================================================================
--- msh/src/Makefile.am 2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/src/Makefile.am 2013-07-20 21:04:11 UTC (rev 28219)
@@ -37,3 +37,7 @@
   test-scheduler-socket \
   test-bitmap \
   test-addressmap
+
+noinst_PROGRAMS = test
+test_SOURCES = test.c
+test_LDADD = -lgnunetutil
\ No newline at end of file

Modified: msh/src/addressmap.c
===================================================================
--- msh/src/addressmap.c        2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/src/addressmap.c        2013-07-20 21:04:11 UTC (rev 28219)
@@ -452,7 +452,7 @@
   {
     if (NULL == m->map[cnt])
     {
-      LOG_ERROR ("Addresses for an instance is missing\n");
+      LOG_ERROR ("Addresses for the instance %u is missing\n", cnt);
       return GNUNET_SYSERR; 
     }
     n++;
@@ -492,7 +492,7 @@
  */
 int
 addressmap_intersect_msg (AddressMap *m, 
-                          struct MSH_MSG_InstanceAdresses *iaddr_msg)
+                          const struct MSH_MSG_InstanceAdresses *iaddr_msg)
 {
   struct InstanceAddr *iaddr;
   struct InstanceAddrInfo *iainfo;

Modified: msh/src/addressmap.h
===================================================================
--- msh/src/addressmap.h        2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/src/addressmap.h        2013-07-20 21:04:11 UTC (rev 28219)
@@ -241,7 +241,7 @@
  */
 int
 addressmap_intersect_msg (AddressMap *m, 
-                          struct MSH_MSG_InstanceAdresses *iaddr_msg);
+                          const struct MSH_MSG_InstanceAdresses *iaddr_msg);
 
 
 

Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/src/mshd.c      2013-07-20 21:04:11 UTC (rev 28219)
@@ -8,7 +8,7 @@
 #include "addressmap.h"
 
 #define LOG(kind,...)                           \
-  GNUNET_log_from (kind, "mshd", __VA_ARGS__)
+  GNUNET_log (kind, __VA_ARGS__)
 
 #define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
 
@@ -356,7 +356,7 @@
     return;
   }
   LOG_DEBUG ("Verification phase complete; commencing reduction phase\n");
-  reduce_ntree ();
+  GNUNET_break (GNUNET_OK == reduce_ntree ());
 }
 
 
@@ -778,7 +778,7 @@
   }
   tv.tv_sec = 1;
   tv.tv_usec = 0;
-  for (cnt = 0; NULL != riainfos[cnt]; cnt++)
+  for (cnt = 0; cnt < rwidth; cnt++)
     verify_addresses (riainfos[cnt]);
   listen_sock = sock;
   finalise_task = scheduler_add (&finalise_round, NULL, &tv);
@@ -887,6 +887,7 @@
   rwidth = 1;
   
   listen_sock = -1;
+  GNUNET_log_setup ("mshd", "DEBUG", NULL);
   while (-1 != (c = getopt (argc, argv, "hw:")))
   {
     switch (c)

Modified: msh/src/reduce.c
===================================================================
--- msh/src/reduce.c    2013-07-20 19:21:10 UTC (rev 28218)
+++ msh/src/reduce.c    2013-07-20 21:04:11 UTC (rev 28219)
@@ -12,11 +12,11 @@
 #include "mtypes.h"
 
 #define LOG(kind,...)                           \
-  GNUNET_log_from (kind, "mshd-addressmap", __VA_ARGS__);
+  GNUNET_log_from (kind, "mshd-addressmap", __VA_ARGS__)
 
-#define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__);
+#define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
 
-#define LOG_ERROR(...) LOG(GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__);
+#define LOG_ERROR(...) LOG(GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__)
 
 /**
  * Send our addressmap to the instance with the given rank
@@ -125,9 +125,10 @@
     }
   }
   GNUNET_assert (nrecv >= 0);
-  nrecv *= nproc;
+  nrecv *= nproc;  
   for (cnt = 0; cnt < nrecv; cnt++)
   {
+    msg = NULL;
     if (MPI_SUCCESS != MPI_Probe (MPI_ANY_SOURCE, MSH_MTYPE_INSTANCE_ADDRESS,
                                   MPI_COMM_WORLD, &stat))
     {
@@ -192,6 +193,7 @@
   {
     if (MPI_SUCCESS != MPI_Barrier (MPI_COMM_WORLD))
       return GNUNET_SYSERR;
+    LOG_DEBUG ("Reduction step %u\n", step);
     step_width = (unsigned int) pow (rwidth, step);
     if (0 != (aggregator = (rank % step_width)))
     {