[GNUnet-SVN] r29372 - msh/src

[gnunet]

Author: harsha
Date: 2013-09-18 14:03:52 +0200 (Wed, 18 Sep 2013)
New Revision: 29372

Removed:
   msh/src/test_scheduler.c
   msh/src/test_scheduler_socket.c
Log:
- remove dead code


Deleted: msh/src/test_scheduler.c
===================================================================
--- msh/src/test_scheduler.c    2013-09-18 12:03:24 UTC (rev 29371)
+++ msh/src/test_scheduler.c    2013-09-18 12:03:52 UTC (rev 29372)
@@ -1,71 +0,0 @@
-#include "common.h"
-#include <gnunet/gnunet_util_lib.h>
-#include "scheduler.h"
-
-#define LOG(kind,...)                           \
-  GNUNET_log_from (kind, "mshd-addressmap", __VA_ARGS__)
-
-#define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-
-#define LOG_ERROR(...) LOG(GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__)
-
-struct Task *task;
-
-struct Task *sig_tasks[2];
-
-/**
- * Event callback for a signal
- *
- * @param sig the signal
- * @param flags EV_* flags
- * @param cls NULL
- */
-static void
-shutdown_signal (evutil_socket_t sig, short flags, void *cls)
-{
-  struct Task **sig_task = cls;
-  
-  scheduler_remove (*sig_task);
-  if (IS_SHUTDOWN_EVENT (flags))
-    return;
-  LOG_DEBUG ("Got signal %d.  Shutting down.\n", sig);
-  scheduler_shutdown ();
-}
-
-
-/**
- * Event callback for the first running task
- *
- * @param nosock we have no sockets associated with this callback
- * @param flags EV_* flags
- * @param cls NULL
- */
-static void
-run (evutil_socket_t nosock, short flags, void *cls)
-{
-  static unsigned int cnt;
-  struct timeval tv;
-
-  GNUNET_assert (-1 == nosock);
-  GNUNET_assert (NULL == cls);
-  GNUNET_assert (0 != (EV_TIMEOUT & flags));
-  LOG_DEBUG ("Run\n");
-  if (0 == cnt++)
-  {
-    tv.tv_sec = 10;
-    tv.tv_usec = 0;
-    task = scheduler_add (&run, NULL, &tv);
-    sig_tasks[0] = scheduler_add_signal (SIGTERM, &shutdown_signal, 
&sig_tasks[0], NULL);
-    sig_tasks[1] = scheduler_add_signal (SIGINT, &shutdown_signal, 
&sig_tasks[1], NULL);
-    return;
-  }
-  scheduler_remove (task);
-  if (!IS_SHUTDOWN_EVENT (flags))
-    scheduler_shutdown ();
-}
-
-int main (int argc, char *argv[])
-{
-  GNUNET_assert (GNUNET_OK == scheduler_run (run, NULL));
-  return 0;
-}

Deleted: msh/src/test_scheduler_socket.c
===================================================================
--- msh/src/test_scheduler_socket.c     2013-09-18 12:03:24 UTC (rev 29371)
+++ msh/src/test_scheduler_socket.c     2013-09-18 12:03:52 UTC (rev 29372)
@@ -1,151 +0,0 @@
-#include "common.h"
-#include <gnunet/gnunet_util_lib.h>
-#include "scheduler.h"
-
-#define LOG(kind,...)                           \
-  GNUNET_log_from (kind, "mshd-addressmap", __VA_ARGS__)
-
-#define LOG_DEBUG(...) LOG(GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-
-#define LOG_ERROR(...) LOG(GNUNET_ERROR_TYPE_ERROR, __VA_ARGS__)
-
-#define LOG_STRERROR(cmd)                  \
-  GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, 
"test-scheduler-socket", cmd)
-
-struct Task *sig_tasks[2];
-
-struct Task *atask;
-
-struct SocketOpenHandle *oh;
-
-static int lsock;
-
-static int csock;
-
-static int result;
-
-
-/**
- * Event callback for a signal
- *
- * @param sig the signal
- * @param flags EV_* flags
- * @param cls NULL
- */
-static void
-shutdown_signal (evutil_socket_t sig, short flags, void *cls)
-{
-  struct Task **sig_task = cls;
-  
-  scheduler_remove (*sig_task);
-  if (IS_SHUTDOWN_EVENT (flags))
-    return;
-  LOG_DEBUG ("Got signal %d.  Shutting down.\n", sig);
-  scheduler_shutdown ();
-}
-
-
-/**
- * Task to call accept and close on a listening socket
- *
- * @param sock the socket
- * @param flags EV_* flags
- * @param cls &atask
- */
-static void
-accept_task (evutil_socket_t fd, short flags, void *cls)
-{
-  struct sockaddr_in caddr;
-  socklen_t caddrlen;
-
-  LOG_DEBUG ("accept task\n");
-  scheduler_remove (atask);
-  atask = NULL;
-  if (IS_SHUTDOWN_EVENT (flags))
-  {
-    MSH_close (lsock);
-    return;
-  }
-  GNUNET_assert (fd == lsock);
-  LOG_DEBUG ("Got a connect\n");
-  caddrlen = sizeof (caddr);
-  if (0 > (csock = accept4 (lsock, &caddr, &caddrlen, 
-                            SOCK_NONBLOCK | SOCK_CLOEXEC)))
-  {
-    LOG_STRERROR ("accept4");
-    MSH_close (lsock);
-    scheduler_shutdown ();
-    return;
-  }
-  if (2 == ++result)
-    scheduler_shutdown ();
-}
-
-
-static void
-socket_connect_cb (int fd, void *cls)
-{
-  oh = NULL;
-  if (fd < 0)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  LOG_DEBUG ("Connected to local listen socket\n");
-  MSH_close (fd);
-  MSH_close (csock);
-  MSH_close (lsock);
-  if (2 == ++result)
-    scheduler_shutdown ();
-}
-
-
-/**
- * Event callback for the first running task
- *
- * @param nosock we have no sockets associated with this callback
- * @param flags EV_* flags
- * @param cls NULL
- */
-static void
-run (evutil_socket_t nosock, short flags, void *cls)
-{
-  struct sockaddr_in addr;
-  socklen_t addrlen;
-  
-  if (IS_SHUTDOWN_EVENT (flags))
-    return;
-  GNUNET_assert (-1 == nosock);
-  GNUNET_assert (NULL == cls);
-  GNUNET_assert (0 != (EV_TIMEOUT & flags));
-  LOG_DEBUG ("Run\n");
-  sig_tasks[0] = scheduler_add_signal (SIGTERM, &shutdown_signal, 
&sig_tasks[0], 
-                                       NULL);
-  sig_tasks[1] = scheduler_add_signal (SIGINT, &shutdown_signal, &sig_tasks[1],
-                                       NULL);
-  addrlen = sizeof (addr);
-  (void) memset (&addr, 0, addrlen);
-  addr.sin_family = AF_INET;
-  if (-1 == (lsock = open_listen_socket (&addr, addrlen, 1)))
-    return;
-  atask = scheduler_add_socket (lsock, EV_READ, &accept_task, &atask, NULL);
-  /* connect to the listening socket */
-  addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  oh = scheduler_open_socket ((struct sockaddr *) &addr, addrlen,
-                              socket_connect_cb, NULL);
-  if (NULL == oh)
-    scheduler_shutdown ();
-  //  ctask = scheduler_add (run2, NULL, TV_IMMEDIATE);
-}
-
-int main (int argc, char *argv[])
-{
-  int ret;
-
-  result = 0;
-  lsock = -1;
-  csock = -1;
-  if (GNUNET_OK != scheduler_run (run, NULL))
-    return 1;  
-  return (2 == result) ? 0 : 1;
-}