summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-22 19:53:49 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-22 19:53:49 +0000
commit5e49d0d61f35bdb7ab2a82e1e01abb13d4602f5e (patch)
treed121cb293f52a5b3f713c22938399fc0ee337fd6
parent2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadnetwork-demos-5e49d0d61f35bdb7ab2a82e1e01abb13d4602f5e.tar.bz2
2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com>
* test.c: Delete unused code.
-rw-r--r--select/ChangeLog4
-rw-r--r--select/test.c87
2 files changed, 4 insertions, 87 deletions
diff --git a/select/ChangeLog b/select/ChangeLog
index 06da62b..eff58c6 100644
--- a/select/ChangeLog
+++ b/select/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * test.c: Delete unused code.
+
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* init.c, test.c: More warnings removed.
diff --git a/select/test.c b/select/test.c
index bc1076e..15b17b5 100644
--- a/select/test.c
+++ b/select/test.c
@@ -143,93 +143,6 @@ echoServer (unsigned short port)
static rtems_id tid;
-static void
-wakeup (struct socket *so, caddr_t arg)
-{
- rtems_event_send (tid, RTEMS_EVENT_0 + (int) arg);
-}
-
-#if 0
-static void
-echoServer2 (port)
-{
- struct sockwakeup sw, sw2;
- socklen_t swlen;
- int clientCount;
- rtems_event_set clientEvents;
-
- getClients (port);
-
- sw.sw_pfn = &wakeup;
- clientEvents = 0;
- for (clientCount = 0 ; clientCount < CLIENT_COUNT ; clientCount++) {
- sw.sw_arg = (caddr_t) clientCount;
- if (setsockopt (clientfd[clientCount], SOL_SOCKET,
- SO_RCVWAKEUP, &sw, sizeof sw) < 0)
- rtems_panic ("setsockopt failed: %s",
- strerror (errno));
- swlen = sizeof sw2;
- if (getsockopt (clientfd[clientCount], SOL_SOCKET,
- SO_RCVWAKEUP, &sw2, &swlen) < 0)
- rtems_panic ("getsockopt failed: %s",
- strerror (errno));
- if (swlen != sizeof sw2
- || sw2.sw_pfn != &wakeup
- || (int) sw2.sw_arg != clientCount)
- rtems_panic ("getsockopt mismatch");
-
- clientEvents |= RTEMS_EVENT_0 + clientCount;
- }
-
- if (rtems_task_ident (RTEMS_SELF, RTEMS_SEARCH_LOCAL_NODE, &tid)
- != RTEMS_SUCCESSFUL)
- rtems_panic ("rtems_task_ident failed");
-
- for (;;) {
- rtems_event_set events;
- rtems_status_code status;
- int i;
-
- status = rtems_event_receive (clientEvents,
- RTEMS_WAIT | RTEMS_EVENT_ANY,
- RTEMS_MILLISECONDS_TO_TICKS (5000),
- &events);
-
- if (status == RTEMS_TIMEOUT) {
- printf ("Timeout\n");
- continue;
- }
-
- for (i = 0; i < CLIENT_COUNT; ++i) {
- if (events == 0)
- break;
- if (events & (i + RTEMS_EVENT_0)) {
- int fd;
- char buf[200];
- int nread;
-
- fd = clientfd[i];
- printf ("Activity on file descriptor %d.\n", fd);
- events &= ~ (i + RTEMS_EVENT_0);
- nread = read (fd, buf, sizeof buf);
- if (nread < 0) {
- printf ("Read error %s.\n", strerror (errno));
- return;
- }
- if (nread == 0) {
- printf ("EOF\n");
- clientEvents &= ~ (i + RTEMS_EVENT_0);
- close (fd);
- if (--clientCount == 0)
- return;
- }
- printf ("Read %d.\n", nread);
- }
- }
- }
-}
-#endif
-
void
doSocket (void)
{