[GNUnet-SVN] r4947 - GNUnet/src/applications/tbench

[gnunet]

Author: grothoff
Date: 2007-06-08 01:12:02 -0600 (Fri, 08 Jun 2007)
New Revision: 4947

Removed:
   GNUnet/src/applications/tbench/tbenchtest_udp.c
Modified:
   GNUnet/src/applications/tbench/Makefile.am
   GNUnet/src/applications/tbench/tbenchtest.c
Log:
better

Modified: GNUnet/src/applications/tbench/Makefile.am
===================================================================
--- GNUnet/src/applications/tbench/Makefile.am  2007-06-08 06:45:02 UTC (rev 
4946)
+++ GNUnet/src/applications/tbench/Makefile.am  2007-06-08 07:12:02 UTC (rev 
4947)
@@ -49,7 +49,7 @@
   $(top_builddir)/src/util/libgnunetutil.la 
 
 tbenchtest_udp_SOURCES = \
-  tbenchtest_udp.c 
+  tbenchtest.c 
 tbenchtest_udp_LDADD = \
   $(top_builddir)/src/applications/stats/libgnunetstats_api.la \
   $(top_builddir)/src/applications/testing/libgnunettesting_api.la \

Modified: GNUnet/src/applications/tbench/tbenchtest.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest.c 2007-06-08 06:45:02 UTC (rev 
4946)
+++ GNUnet/src/applications/tbench/tbenchtest.c 2007-06-08 07:12:02 UTC (rev 
4947)
@@ -122,7 +122,7 @@
     return -1;
   }
 #if START_PEERS
-  peers = gnunet_testing_start_daemons("tcp",
+  peers = gnunet_testing_start_daemons(NULL == strstr(argv[0], "_udp") ? "tcp" 
: "udp",
                                       "advertising tbench topology stats",
                                       "/tmp/gnunet-tbench-test",
                                       2087,

Deleted: GNUnet/src/applications/tbench/tbenchtest_udp.c
===================================================================
--- GNUnet/src/applications/tbench/tbenchtest_udp.c     2007-06-08 06:45:02 UTC 
(rev 4946)
+++ GNUnet/src/applications/tbench/tbenchtest_udp.c     2007-06-08 07:12:02 UTC 
(rev 4947)
@@ -1,173 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2001, 2002, 2004, 2005, 2006 Christian Grothoff (and other 
contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file applications/tbench/tbenchtest.c
- * @brief Transport mechanism testing tool
- * @author Paul Ruth, Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_stats_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_util_crypto.h"
-#include "gnunet_util_config_impl.h"
-#include "gnunet_util_network_client.h"
-#include "tbench.h"
-
-#define START_PEERS 1
-
-static PeerIdentity peer1;
-
-static PeerIdentity peer2;
-
-
-static int test(struct ClientServerConnection * sock,
-               unsigned int messageSize,
-               unsigned int messageCnt,
-               unsigned int messageIterations,
-               cron_t messageSpacing,
-               unsigned int messageTrainSize,
-               cron_t messageTimeOut /* in milli-seconds */) {
-  int ret;
-  CS_tbench_request_MESSAGE msg;
-  CS_tbench_reply_MESSAGE * buffer;
-  float messagesPercentLoss;
-
-  printf(_("Using %u messages of size %u for %u times.\n"),
-        messageCnt,
-        messageSize,
-        messageIterations);
-  msg.header.size = htons(sizeof(CS_tbench_request_MESSAGE));
-  msg.header.type = htons(CS_PROTO_tbench_REQUEST);
-  msg.msgSize     = htonl(messageSize);
-  msg.msgCnt      = htonl(messageCnt);
-  msg.iterations  = htonl(messageIterations);
-  msg.intPktSpace = htonll(messageSpacing);
-  msg.trainSize   = htonl(messageTrainSize);
-  msg.timeOut     = htonll(messageTimeOut);
-  msg.priority    = htonl(5);
-  msg.receiverId  = peer2;
-
-  if (SYSERR == connection_write(sock,
-                             &msg.header))
-    return -1;
-  ret = 0;
-
-  buffer = NULL;
-  if (OK == connection_read(sock, (MESSAGE_HEADER**)&buffer)) {
-    if ((float)buffer->mean_loss <= 0){
-      messagesPercentLoss = 0.0;
-    } else {
-      messagesPercentLoss = (buffer->mean_loss/((float)htons(msg.msgCnt)));
-    }
-    printf(_("Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"),
-          ntohll(buffer->max_time),
-          ntohll(buffer->min_time),
-          buffer->mean_time,
-          buffer->variance_time);
-    printf(_("Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"),
-          ntohl(buffer->max_loss),
-          ntohl(buffer->min_loss),
-          buffer->mean_loss,
-          buffer->variance_loss);
-  } else {
-    printf(_("\nFailed to receive reply from gnunetd.\n"));
-    ret = -1;
-  }
-  FREENONNULL(buffer);
-
-  return ret;
-}
-
-
-/**
- * Testcase to test p2p communications.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0: ok, -1: error
- */
-int main(int argc, char ** argv) {
-#if START_PEERS
-  struct DaemonContext * peers;
-#endif
-  int i;
-  int ok;
-  int ret;
-  struct ClientServerConnection * sock;
-  struct GC_Configuration * cfg;
-
-  ret = 0;
-  ok = 1;
-  cfg = GC_create_C_impl();
-  if (-1 == GC_parse_configuration(cfg,
-                                  "check.conf")) {
-    GC_free(cfg);
-    return -1;
-  }
-#if START_PEERS
-  peers = gnunet_testing_start_daemons("udp",
-                                      "advertising tbench topology stats",
-                                      "/tmp/gnunet-tbench-test-udp",
-                                      2087,
-                                      10000,
-                                      2);
-  if (peers == NULL) {
-    GC_free(cfg);
-    return -1;
-   }
-#endif
-  peer1 = peers->peer;
-  peer2 = peers->next->peer;
-  if (OK != gnunet_testing_connect_daemons(2087,
-                                          12087)) {
-    gnunet_testing_stop_daemons(peers);
-    fprintf(stderr,
-           "Failed to connect the peers!\n");
-    GC_free(cfg);
-    return -1;
-  }
-  sock = client_connection_create(NULL,
-                                 cfg);
-
-  printf(_("Running benchmark...\n"));
-  /* 'slow' pass: wait for bandwidth negotiation! */
-  if (ret == 0)
-    ret = test(sock, 64, 100, 4, 50 * cronMILLIS, 1, 5 * cronSECONDS);
-  /* 'blast' pass: hit bandwidth limits! */
-  for (i=8;i<60000;i*=2) {
-    if (ret == 0)
-      ret = test(sock, i, 1+1024/i, 4, 10 * cronMILLIS, 2, 2 * cronSECONDS);
-  }
-  ret = test(sock, 32768, 10, 10, 500 * cronMILLIS, 1, 10 * cronSECONDS);
-  connection_destroy(sock);
-#if START_PEERS
-  gnunet_testing_stop_daemons(peers);
-#endif
-  if (ok == 0)
-    ret = 1;
-
-  GC_free(cfg);
-  return ret;
-}
-
-/* end of tbenchtest.c */