]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
kclient: remove ancient crufty test code
authorSage Weil <sage@newdream.net>
Thu, 20 Aug 2009 18:23:31 +0000 (11:23 -0700)
committerSage Weil <sage@newdream.net>
Thu, 20 Aug 2009 18:23:31 +0000 (11:23 -0700)
src/kernel/test/Makefile [deleted file]
src/kernel/test/kernclient.c [deleted file]
src/kernel/test/kernserver.c [deleted file]
src/kernel/test/ktcp.c [deleted file]
src/kernel/test/ktcp.h [deleted file]
src/kernel/test/messenger.h [deleted file]
src/kernel/test/messenger_mini.c [deleted file]
src/kernel/test/threadtest.c [deleted file]
src/kernel/test/userclient.c [deleted file]
src/kernel/test/userserver.c [deleted file]

diff --git a/src/kernel/test/Makefile b/src/kernel/test/Makefile
deleted file mode 100644 (file)
index f45e9d0..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for CEPH kernel socket test.
-#
-
-obj-$(CONFIG_CEPHTESTS_FS) += ksocktest.o
-
-ksocktest-objs := kernserver.o messenger_mini.o ktcp.o
diff --git a/src/kernel/test/kernclient.c b/src/kernel/test/kernclient.c
deleted file mode 100644 (file)
index 568f168..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-#include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <linux/string.h>
-#include <net/tcp.h>
-
-#include <linux/ceph_fs.h>
-#include "messenger.h"
-#include "ktcp.h"
-
-
-#define PORT 9009
-#define HOST cranium
-#define cranium 192.168.1.3
-
-MODULE_AUTHOR("Patience Warnick <patience@newdream.net>");
-MODULE_DESCRIPTION("kernel thread test for Linux");
-MODULE_LICENSE("GPL");
-
-int inet_aton (const char *cp, struct in_addr *addr);
-struct task_struct *thread;
-
-
-/*
- *  Wake up a thread when there is work to do
- */
-/*  void thread_wake_up(void)
-{
-}
-*/
-/*
- * Client socket thread
- */
-static int sock_thread(void *unusedfornow)
-{
-       struct ceph_messenger *msgr = NULL;
-       struct ceph_connection *con;
-       struct sockaddr_in saddr;
-       int ret;
-
-       printk(KERN_INFO "starting kernel thread\n");
-
-       con = new_connection(msgr);
-
-       /* inet_aton("192.168.1.3", &saddr.sin_addr); */
-       /* con->peer_addr.ipaddr.sin_addr = saddr.sin_addr; */
-
-        saddr.sin_family = AF_INET;
-        saddr.sin_addr.s_addr = htonl(INADDR_ANY);
-        saddr.sin_port = htons(PORT);
-       printk(KERN_INFO "saddr info %p\n", &saddr);
-       con->peer_addr.ipaddr = saddr;
-
-
-       set_bit(WRITE_PEND, &con->state);
-
-       printk(KERN_INFO "about to connect to server\n");
-       /* connect to server */
-       if ((ret = _kconnect(con))) {
-               printk(KERN_INFO "error connecting %d\n", ret);
-               goto done;
-       }
-       printk(KERN_INFO "connect succeeded\n");
-
-       set_current_state(TASK_INTERRUPTIBLE);
-        /* an endless loop in which we are doing our work */
-       while (!kthread_should_stop())
-        {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule();
-               printk(KERN_INFO "sock thread has been interrupted\n");
-       }
-
-       set_current_state(TASK_RUNNING);
-        sock_release(con->sock);
-done:
-        kfree(con);
-       printk(KERN_INFO "kernel thread exiting\n");
-       return 0;
-}
-
-static int __init init_kst(void)
-{
-       int ret;
-
-       printk(KERN_INFO "kernel thread test init\n");
-       /* create new kernel threads */
-       ret = work_init();
-       thread = kthread_run(sock_thread, NULL, "sock-thread");
-               if (IS_ERR(thread))
-               {
-                       printk(KERN_INFO "failured to start kernel thread\n");
-                       return -ENOMEM;
-               }
-       return 0;
-}
-
-static void __exit exit_kst(void)
-{
-       printk(KERN_INFO "kernel thread test exit\n");
-       shutdown_workqueues();
-       kthread_stop(thread);
-       wake_up_process(thread);
-
-       return;
-}
-
-
-module_init(init_kst);
-module_exit(exit_kst);
diff --git a/src/kernel/test/kernserver.c b/src/kernel/test/kernserver.c
deleted file mode 100644 (file)
index 5c6b0b2..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-#include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <linux/string.h>
-#include <net/tcp.h>
-
-#include <linux/ceph_fs.h>
-#include "messenger.h"
-#include "ktcp.h"
-
-
-#define PORT 9009
-#define HOST cranium
-#define cranium 192.168.1.3
-
-MODULE_AUTHOR("Patience Warnick <patience@newdream.net>");
-MODULE_DESCRIPTION("kernel thread test for Linux");
-MODULE_LICENSE("GPL");
-
-struct ceph_messenger *ceph_messenger_create(void);
-int inet_aton (const char *cp, struct in_addr *addr);
-struct task_struct *thread;
-
-
-/*
- *  Wake up a thread when there is work to do
- */
-/*  void thread_wake_up(void)
-{
-}
-*/
-
-/*
- * Client connect thread
- */
-static int listen_thread(void *unusedfornow)
-{
-       struct ceph_messenger *msgr = NULL;
-
-       printk(KERN_INFO "starting kernel listen thread\n");
-
-       msgr = ceph_messenger_create();
-       if (msgr == NULL) return 1;
-
-       printk(KERN_INFO "about to listen\n");
-
-       set_current_state(TASK_INTERRUPTIBLE);
-        /* an endless loop in which we are doing our work */
-       while (!kthread_should_stop())
-        {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule();
-               printk(KERN_INFO "sock thread has been interrupted\n");
-       }
-
-       set_current_state(TASK_RUNNING);
-        sock_release(msgr->listen_sock);
-        kfree(msgr);
-       printk(KERN_INFO "kernel thread exiting\n");
-       return 0;
-}
-/*
- * Client connect thread
- */
-static int connect_thread(void *unusedfornow)
-{
-       struct ceph_messenger *msgr = NULL;
-       struct ceph_connection *con;
-       struct sockaddr_in saddr;
-       int ret;
-
-       printk(KERN_INFO "starting kernel thread\n");
-
-       con = new_connection(msgr);
-
-       /* inet_aton("192.168.1.3", &saddr.sin_addr); */
-       /* con->peer_addr.ipaddr.sin_addr = saddr.sin_addr; */
-
-        saddr.sin_family = AF_INET;
-        saddr.sin_addr.s_addr = htonl(INADDR_ANY);
-        saddr.sin_port = htons(PORT);
-       printk(KERN_INFO "saddr info %p\n", &saddr);
-       con->peer_addr.ipaddr = saddr;
-
-
-       set_bit(WRITE_PEND, &con->state);
-
-       printk(KERN_INFO "about to connect to server\n");
-       /* connect to server */
-       if ((ret = _kconnect(con))) {
-               printk(KERN_INFO "error connecting %d\n", ret);
-               goto done;
-       }
-       printk(KERN_INFO "connect succeeded\n");
-
-       set_current_state(TASK_INTERRUPTIBLE);
-        /* an endless loop in which we are doing our work */
-       while (!kthread_should_stop())
-        {
-               set_current_state(TASK_INTERRUPTIBLE);
-               schedule();
-               printk(KERN_INFO "sock thread has been interrupted\n");
-       }
-
-       set_current_state(TASK_RUNNING);
-        sock_release(con->sock);
-done:
-        kfree(con);
-       printk(KERN_INFO "kernel thread exiting\n");
-       return 0;
-}
-
-static int __init init_kst(void)
-{
-       int ret;
-
-       printk(KERN_INFO "kernel thread test init\n");
-       /* create new kernel threads */
-       ret = work_init();
-       thread = kthread_run(listen_thread, NULL, "listen-thread");
-               if (IS_ERR(thread))
-               {
-                       printk(KERN_INFO "failured to start kernel thread\n");
-                       return -ENOMEM;
-               }
-       return 0;
-}
-
-static void __exit exit_kst(void)
-{
-       printk(KERN_INFO "kernel thread test exit\n");
-       shutdown_workqueues();
-       kthread_stop(thread);
-       wake_up_process(thread);
-
-       return;
-}
-
-
-module_init(init_kst);
-module_exit(exit_kst);
diff --git a/src/kernel/test/ktcp.c b/src/kernel/test/ktcp.c
deleted file mode 100644 (file)
index d60986a..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <net/tcp.h>
-#include <linux/string.h>
-#include "messenger.h"
-#include "ktcp.h"
-
-struct workqueue_struct *recv_wq;       /* receive work queue */
-struct workqueue_struct *send_wq;              /* send work queue */
-
-/*
- * socket callback functions 
- */
-/* listen socket received a connect */
-static void ceph_accept_ready(struct sock *sk, int count_unused)
-{
-        struct ceph_messenger *msgr = (struct ceph_messenger *)sk->sk_user_data;
-
-        printk(KERN_INFO "Entered ceph_accept_ready \n");
-       if (msgr && (sk->sk_state == TCP_LISTEN))
-               queue_work(recv_wq, &msgr->awork); 
-}
-
-/* Data available on socket or listen socket received a connect */
-static void ceph_data_ready(struct sock *sk, int count_unused)
-{
-        struct ceph_connection *con = (struct ceph_connection *)sk->sk_user_data;
-
-        printk(KERN_INFO "Entered ceph_data_ready \n");
-
-       if (con && (sk->sk_state != TCP_CLOSE_WAIT)) {
-               queue_work(recv_wq, &con->rwork);
-       }
-}
-
-/* socket has bufferspace for writing */
-static void ceph_write_space(struct sock *sk)
-{
-        struct ceph_connection *con = (struct ceph_connection *)sk->sk_user_data;
-
-        printk(KERN_INFO "Entered ceph_write_space state = %u\n",con->state);
-        if (con && test_bit(WRITE_PEND, &con->state)) {
-                printk(KERN_INFO "WRITE_PEND set in connection\n");
-                queue_work(send_wq, &con->swork);
-        }
-}
-
-/* sockets state has change */
-static void ceph_state_change(struct sock *sk)
-{
-        struct ceph_connection *con = (struct ceph_connection *)sk->sk_user_data;
-
-       printk(KERN_INFO "Entered ceph_state_change state = %u\n", con->state);
-        printk(KERN_INFO "Entered ceph_state_change sk_state = %u\n", sk->sk_state);
-
-        if (sk->sk_state == TCP_ESTABLISHED) {
-                ceph_write_space(sk);
-        }
-       /* TBD: maybe set connection state to close if TCP_CLOSE
-        * simple case for now,                                  
-        */
-}
-
-/* make a listening socket active by setting up the call back functions */
-int listen_sock_callbacks(struct socket *sock, void *user_data)
-{
-        struct sock *sk = sock->sk;
-        sk->sk_user_data = user_data;
-        printk(KERN_INFO "Entered listen_sock_callbacks\n");
-
-        /* Install callbacks */
-        sk->sk_data_ready = ceph_accept_ready;
-        return 0;
-}
-
-/* make a socket active by setting up the call back functions */
-int add_sock_callbacks(struct socket *sock, void *user_data)
-{
-        struct sock *sk = sock->sk;
-        sk->sk_user_data = user_data;
-        printk(KERN_INFO "Entered add_sock_callbacks\n");
-
-        /* Install callbacks */
-        sk->sk_data_ready = ceph_data_ready;
-       sk->sk_state_change = ceph_state_change;
-       sk->sk_write_space = ceph_write_space;
-
-        return 0;
-}
-/*
- * initiate connection to a remote socket.
- */
-int _kconnect(struct ceph_connection *con)
-{
-       int ret;
-       struct sockaddr *paddr = (struct sockaddr *)&con->peer_addr.ipaddr;
-
-        set_bit(CONNECTING, &con->state);
-
-        ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &con->sock);
-        if (ret < 0) {
-                printk(KERN_INFO "sock_create_kern error: %d\n", ret);
-                goto done;
-        }
-
-        /* setup callbacks */
-        add_sock_callbacks(con->sock, (void *)con);
-
-
-        ret = con->sock->ops->connect(con->sock, paddr,
-                                      sizeof(struct sockaddr_in), O_NONBLOCK);
-        if (ret == -EINPROGRESS) return 0;
-        if (ret < 0) {
-                /* TBD check for fatal errors, retry if not fatal.. */
-                printk(KERN_INFO "kernel_connect error: %d\n", ret);
-                sock_release(con->sock);
-                con->sock = NULL;
-        }
-done:
-        return ret;
-}
-
-/*
- * setup listening socket
- */
-int _klisten(struct ceph_messenger *msgr)
-{
-       int ret;
-       struct socket *sock = NULL;
-       int optval = 1;
-       struct sockaddr_in *myaddr = &msgr->inst.addr.ipaddr;
-
-
-       ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);
-        if (ret < 0) {
-               printk(KERN_INFO "sock_create_kern error: %d\n", ret);
-               return ret;
-       }
-       ret = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-                               (char *)&optval, sizeof(optval)); 
-       if (ret < 0) {
-               printk("Failed to set SO_REUSEADDR: %d\n", ret);
-               goto err;
-       }
-
-       /* set user_data to be the messenger */
-       sock->sk->sk_user_data = msgr;
-
-       /* no user specified address given so create, will allow arg to mount */
-       myaddr->sin_family = AF_INET;
-       myaddr->sin_addr.s_addr = htonl(INADDR_ANY);
-       myaddr->sin_port = htons(CEPH_PORT);  /* known port for now */
-       /* myaddr->sin_port = htons(0); */  /* any port */
-       ret = sock->ops->bind(sock, (struct sockaddr *)myaddr, 
-                               sizeof(struct sockaddr_in));
-       if (ret < 0) {
-               printk("Failed to bind to port %d\n", ret);
-               goto err;
-       }
-
-       ret = kernel_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-                               (char *)&optval, sizeof(optval)); 
-       if (ret < 0) {
-               printk("Failed to set SO_KEEPALIVE: %d\n", ret);
-               goto err;
-       }
-
-       msgr->listen_sock = sock;
-
-       /* TBD: probaby want to tune the backlog queue .. */
-       ret = sock->ops->listen(sock, NUM_BACKUP);
-       if (ret < 0) {
-               printk(KERN_INFO "kernel_listen error: %d\n", ret);
-               msgr->listen_sock = NULL;
-               goto err;
-       }
-        listen_sock_callbacks(msgr->listen_sock, (void *)msgr);
-       return ret;
-err:
-       sock_release(sock);
-       return ret;
-}
-
-/*
- *  accept a connection
- */
-int _kaccept(struct socket *sock, struct ceph_connection *con)
-{
-       int ret;
-       struct sockaddr *paddr = (struct sockaddr *)&con->peer_addr.ipaddr;
-       int len;
-
-
-        ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &con->sock);
-        if (ret < 0) {
-                printk(KERN_INFO "sock_create_kern error: %d\n", ret);
-                goto done;
-        }
-
-        ret = sock->ops->accept(sock, con->sock, O_NONBLOCK);
-        if (ret < 0) {
-               printk(KERN_INFO "accept error: %d\n", ret);
-               goto err;
-       }
-
-        /* setup callbacks */
-        add_sock_callbacks(con->sock, (void *)con);
-
-       con->sock->ops = sock->ops;
-       con->sock->type = sock->type;
-       ret = con->sock->ops->getname(con->sock, paddr, &len, 2);
-        if (ret < 0) {
-               printk(KERN_INFO "getname error: %d\n", ret);
-               goto err;
-       }
-
-        set_bit(ACCEPTING, &con->state);
-done:
-       return ret;
-err:
-       sock_release(con->sock);
-       return ret;
-}
-
-/*
- * receive a message this may return after partial send
- */
-int _krecvmsg(struct socket *sock, void *buf, size_t len)
-{
-       struct kvec iov = {buf, len};
-       struct msghdr msg = {.msg_flags = 0};
-       int rlen = 0;           /* length read */
-
-       printk(KERN_INFO "entered krevmsg\n");
-       msg.msg_flags |= MSG_DONTWAIT | MSG_NOSIGNAL;
-
-       /* receive one kvec for now...  */
-       rlen = kernel_recvmsg(sock, &msg, &iov, 1, len, msg.msg_flags);
-        if (rlen < 0) {
-               printk(KERN_INFO "kernel_recvmsg error: %d\n", rlen);
-        }
-       /* TBD: kernel_recvmsg doesn't fill in the name and namelen
-         */
-       return(rlen);
-
-}
-
-/*
- * Send a message this may return after partial send
- */
-int _ksendmsg(struct socket *sock, struct kvec *iov, size_t kvlen, size_t len)
-{
-       struct msghdr msg = {.msg_flags = 0};
-       int rlen = 0;
-
-       printk(KERN_INFO "entered ksendmsg\n");
-       msg.msg_flags |=  MSG_DONTWAIT | MSG_NOSIGNAL;
-
-       rlen = kernel_sendmsg(sock, &msg, iov, kvlen, len);
-        if (rlen < 0) {
-               printk(KERN_INFO "kernel_sendmsg error: %d\n", rlen);
-        }
-       return(rlen);
-}
-
-/*
- *  workqueue initialization
- */
-
-int work_init(void)
-{
-        int ret = 0;
-
-        printk(KERN_INFO "entered work_init\n");
-        /*
-         * Create a num CPU threads to handle receive requests
-         * note: we can create more threads if needed to even out
-         * the scheduling of multiple requests..
-         */
-        recv_wq = create_workqueue("ceph-recv");
-        ret = IS_ERR(recv_wq);
-        if (ret) {
-                printk(KERN_INFO "receive worker failed to start: %d\n", ret);
-                destroy_workqueue(recv_wq);
-                return ret;
-        }
-
-        /*
-         * Create a single thread to handle send requests
-         * note: may use same thread pool as receive workers later...
-         */
-        send_wq = create_singlethread_workqueue("ceph-send");
-        ret = IS_ERR(send_wq);
-        if (ret) {
-                printk(KERN_INFO "send worker failed to start: %d\n", ret);
-                destroy_workqueue(send_wq);
-                return ret;
-        }
-        printk(KERN_INFO "successfully created wrkqueues\n");
-
-        return(ret);
-}
-
-/*
- *  workqueue shutdown
- */
-void shutdown_workqueues(void)
-{
-        destroy_workqueue(send_wq);
-        destroy_workqueue(recv_wq);
-}
diff --git a/src/kernel/test/ktcp.h b/src/kernel/test/ktcp.h
deleted file mode 100644 (file)
index 841dd7b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _FS_CEPH_TCP_H
-#define _FS_CEPH_TCP_H
-
-extern struct workqueue_struct *recv_wq;       /* receive work queue */
-extern struct workqueue_struct *send_wq;       /* send work queue */
-
-/* prototype definitions */
-int _kconnect(struct ceph_connection *);
-int _klisten(struct ceph_messenger *);
-int _kaccept(struct socket *, struct ceph_connection *);
-int _krecvmsg(struct socket *, void *, size_t );
-int _ksendmsg(struct socket *, struct kvec *, size_t, size_t);
-int work_init(void);
-void shutdown_workqueues(void);
-
-/* Well known port for ceph client listener.. */
-#define CEPH_PORT 2002
-/* Max number of outstanding connections in listener queueu */
-#define NUM_BACKUP 10
-#endif
diff --git a/src/kernel/test/messenger.h b/src/kernel/test/messenger.h
deleted file mode 100644 (file)
index b9cf355..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __FS_CEPH_MESSENGER_H
-#define __FS_CEPH_MESSENGER_H
-
-#include <linux/uio.h>
-#include <linux/net.h>
-#include <linux/radix-tree.h>
-#include <linux/workqueue.h>
-#include <linux/ceph_fs.h>
-
-struct ceph_messenger {
-        struct socket *listen_sock;      /* listening socket */
-        struct work_struct awork;        /* accept work */
-        struct ceph_entity_inst inst;    /* my name+address */
-        spinlock_t con_lock;
-        struct list_head con_all;        /* all connections */
-};
-
-#define        NEW 1
-#define        CONNECTING 2
-#define        ACCEPTING 3
-#define        OPEN 4
-#define READ_PEND 5
-#define WRITE_PEND 6
-#define        REJECTING 7
-#define        CLOSED 8
-
-
-struct ceph_connection {
-       struct socket *sock;    /* connection socket */
-       __u32 state;
-       
-       atomic_t nref;
-       spinlock_t con_lock;    /* connection lock */
-
-       struct list_head list_all;   /* msgr->con_all */
-       struct ceph_entity_addr peer_addr; /* peer address */
-
-       char *buffer;
-
-       struct work_struct rwork;               /* received work */
-       struct work_struct swork;               /* send work */
-       int retries;
-       int error;                              /* error on connection */
-};
-
-
-struct ceph_connection *new_connection(struct ceph_messenger *);
-int do_connect(struct ceph_connection *con);
-#endif
diff --git a/src/kernel/test/messenger_mini.c b/src/kernel/test/messenger_mini.c
deleted file mode 100644 (file)
index 081e7e4..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-#include <linux/kthread.h>
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <linux/string.h>
-#include <net/tcp.h>
-
-#include <linux/ceph_fs.h>
-#include "messenger.h"
-#include "ktcp.h"
-
-static void try_read(struct work_struct *);
-static void try_write(struct work_struct *);
-static void try_accept(struct work_struct *);
-
-int add_sock_callbacks(struct socket *, struct ceph_connection *);
-
-
-/*
- * connections
- */
-
-/* 
- * create a new connection.  initial state is NEW.
- */
-struct ceph_connection *new_connection(struct ceph_messenger *msgr)
-{
-       struct ceph_connection *con;
-       con = kmalloc(sizeof(struct ceph_connection), GFP_KERNEL);
-       if (con == NULL) 
-               return NULL;
-       memset(con, 0, sizeof(struct ceph_connection));
-
-       /* con->msgr = msgr; */
-
-       spin_lock_init(&con->con_lock);
-       INIT_WORK(&con->rwork, try_read);       /* setup work structure */
-       INIT_WORK(&con->swork, try_write);      /* setup work structure */
-
-       atomic_inc(&con->nref);
-       return con;
-}
-
-/*
- * call when socket is writeable
- */
-static void try_write(struct work_struct *work)
-{
-       struct ceph_connection *con;
-        struct kvec iov;
-       int ret;
-
-
-
-       con = container_of(work, struct ceph_connection, swork);
-
-        printk(KERN_INFO "Entered try_write state = %u\n", con->state);
-
-       clear_bit(WRITE_PEND, &con->state);
-       set_bit(READ_PEND, &con->state);
-
-
-        con->buffer = kzalloc(256, GFP_KERNEL);
-        if (con->buffer == NULL)
-                goto done;
-
-        strcpy(con->buffer, "hello world");
-        iov.iov_base = con->buffer;
-        iov.iov_len = 255;
-        printk(KERN_INFO "about to send message\n");
-        ret = _ksendmsg(con->sock,&iov,1,iov.iov_len);
-        if (ret < 0) goto done;
-        printk(KERN_INFO "wrote %d bytes to server\n", ret);
-
-       
-
-       kfree(con->buffer);
-done:
-       return;
-}
-
-
-/*
- * call when data is available on the socket
- */
-static void try_read(struct work_struct *work)
-{
-       struct ceph_connection *con;
-       int len;
-
-
-       con = container_of(work, struct ceph_connection, rwork);
-
-        printk(KERN_INFO "Entered try_read state = %u\n", con->state);
-
-        con->buffer = kzalloc(256, GFP_KERNEL);
-        if (con->buffer == NULL)
-                goto done;
-
-       len = _krecvmsg(con->sock,con->buffer,255);
-       if (len < 0){
-               printk(KERN_INFO "ERROR reading from socket\n");
-               goto done;
-       }
-        printk(KERN_INFO "received message: %s\n", con->buffer);
-        printk(KERN_INFO "message length: %d\n", len);
-
-       kfree(con->buffer);
-        set_bit(WRITE_PEND, &con->state);
-        queue_work(send_wq, &con->swork);
-done:
-       return;
-}
-
-/*
- *  worker function when listener receives a connect
- */
-static void try_accept(struct work_struct *work)
-{
-        struct ceph_connection *new_con = NULL;
-        struct ceph_messenger *msgr;
-
-        msgr = container_of(work, struct ceph_messenger, awork);
-
-        printk(KERN_INFO "Entered try_accept\n");
-
-        /* initialize the msgr connection */
-        new_con = new_connection(msgr);
-        if (new_con == NULL) {
-                printk(KERN_INFO "malloc failure\n");
-                goto done;
-        }
-
-        if(_kaccept(msgr->listen_sock, new_con) < 0) {
-                printk(KERN_INFO "error accepting connection\n");
-                kfree(new_con);
-                goto done;
-        }
-        printk(KERN_INFO "accepted connection \n");
-
-        /* prepare_write_accept_announce(msgr, new_con); */
-
-        /* add_connection_accepting(msgr, new_con); */
-
-        set_bit(WRITE_PEND, &new_con->state);
-        /*
-         * hand off to worker threads ,should be able to write, we want to
-         * try to write right away, we may have missed socket state change
-         */
-        queue_work(send_wq, &new_con->swork);
-done:
-        return;
-}
-
-/*
- * create a new messenger instance, creates a listening socket
- */
-struct ceph_messenger *ceph_messenger_create(void)
-{
-        struct ceph_messenger *msgr;
-        int ret = 0;
-
-        msgr = kzalloc(sizeof(*msgr), GFP_KERNEL);
-        if (msgr == NULL)
-                return ERR_PTR(-ENOMEM);
-
-        spin_lock_init(&msgr->con_lock);
-
-        /* create listening socket */
-        ret = _klisten(msgr);
-        if(ret < 0) {
-                kfree(msgr);
-                return  ERR_PTR(ret);
-        }
-
-        INIT_WORK(&msgr->awork, try_accept);       /* setup work structure */
-
-        printk(KERN_INFO "ceph_messenger_create listening on %x:%d\n",
-               ntohl(msgr->inst.addr.ipaddr.sin_addr.s_addr),
-               ntohl(msgr->inst.addr.ipaddr.sin_port));
-        return msgr;
-}
diff --git a/src/kernel/test/threadtest.c b/src/kernel/test/threadtest.c
deleted file mode 100644 (file)
index d594d4f..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <linux/module.h>
-#include <linux/kthread.h>
-
-MODULE_AUTHOR("Patience Warnick <patience@newdream.net>");
-MODULE_DESCRIPTION("kernel thread test for Linux");
-MODULE_LICENSE("GPL");
-
-#define NTHREADS 3
-struct task_struct *thread[3];
-/*  static DECLARE_WAIT_QUEUE_HEAD(dispatch_wait); */
-
-/*
- *  Wake up a thread when there is work to do
- */
-/*  void thread_wake_up(void)
-{
-}
-*/
-
-static int dispatch_thread(void *unusedfornow)
-{
-       printk(KERN_INFO "starting kernel thread\n");
-       set_current_state(TASK_INTERRUPTIBLE);
-        /* an endless loop in which we are doing our work */
-       while (!kthread_should_stop())
-        {
-               schedule();
-               printk(KERN_INFO "Dispatch thread has been interrupted\n");
-               set_current_state(TASK_INTERRUPTIBLE);
-       }
-       set_current_state(TASK_RUNNING);
-       printk(KERN_INFO "kernel thread exiting\n");
-       return 0;
-}
-
-static int __init init_kst(void)
-{
-       int i;
-
-       printk(KERN_INFO "kernel thread test init\n");
-       /* create new kernel threads */
-       for (i=0; i < NTHREADS; i++) {
-               thread[i] = kthread_run(dispatch_thread, NULL, "dispatcher thread");
-               if (IS_ERR(thread[i]))
-               {
-                       printk(KERN_INFO "failured to start kernel thread\n");
-                       return -ENOMEM;
-               }
-       }
-       return 0;
-}
-
-static void __exit exit_kst(void)
-{
-       int i;
-
-       printk(KERN_INFO "kernel thread test exit\n");
-       for (i=0; i <NTHREADS; i++) {
-               kthread_stop(thread[i]);
-               wake_up_process(thread[i]);
-       }
-
-       return;
-}
-
-
-module_init(init_kst);
-module_exit(exit_kst);
diff --git a/src/kernel/test/userclient.c b/src/kernel/test/userclient.c
deleted file mode 100644 (file)
index 1d1a88f..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h> 
-#include <arpa/inet.h>
-#include <netinet/in.h> 
-
-#define HOST_ADDR "192.168.1.10"
-#define PORT 32222
-
-int main(int argc, char **argv) 
-{
-       int port, sd, len;
-       struct hostent *host;
-       struct in_addr h_addr;
-       struct sockaddr_in saddr;
-       char buf[256];
-
-
-       if (argc != 3) {
-               fprintf(stderr,"usage %s hostname port\n", argv[0]);
-               exit(1);
-       }
-       if ((host = gethostbyname(argv[1])) == NULL) {
-               fprintf(stderr, "nslookup failed on '%s'\n", argv[1]);
-               exit(1);
-       }
-       h_addr.s_addr = *((unsigned long *) host->h_addr_list[0]);
-       fprintf(stdout, "%s\n", inet_ntoa(h_addr));
-       port = atoi(argv[2]);
-       printf("port num = %d\n", port);
-
-       sd = socket(AF_INET, SOCK_STREAM, 0);
-       if (sd < 0) {
-               fprintf(stderr,"socket open error");
-               exit(1);
-       }
-       printf("created socket\n");
-        bzero((char *) &saddr, sizeof(saddr));
-        saddr.sin_family = AF_INET;
-        bcopy((char *)host->h_addr, (char *)&saddr.sin_addr.s_addr,
-                        host->h_length);
-        saddr.sin_port = htons(port);
-        if (connect(sd,(struct sockaddr *)&saddr,sizeof(saddr)) < 0) {
-                fprintf(stderr,"connection error\n");
-                exit(1);
-        }
-        printf("connected to kernel host\n");
-        bzero(buf,256);
-        len = read(sd,buf,255);
-        if (len < 0) {
-                fprintf(stderr,"read error\n");
-                exit(1);
-        }
-        printf("Message received: %s\n",buf);
-
-        printf("Please enter the message: ");
-        bzero(buf,256);
-        fgets(buf,255,stdin);
-        len = write(sd,buf,strlen(buf));
-        if (len < 0) {
-                fprintf(stderr,"write error\n");
-                exit(1);
-        }
-        bzero(buf,256);
-        len = read(sd,buf,255);
-        if (len < 0) {
-                fprintf(stderr,"write error\n");
-                exit(1);
-        }
-        printf("received message %s\n",buf);
-       close(sd);
-       exit(0);
-}
diff --git a/src/kernel/test/userserver.c b/src/kernel/test/userserver.c
deleted file mode 100644 (file)
index a27868c..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* note:  port number is passed as an argument */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h> 
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-int main(int argc, char *argv[])
-{
-       struct sockaddr_in saddr, caddr;
-       int sd, new_sd, port, clen, numbytes;
-       char buf[256];
-
-       if (argc < 2) {
-               fprintf(stderr,"error must enter port \n");
-               exit(1);
-       }
-       printf("starting server\n");
-
-       sd = socket(AF_INET, SOCK_STREAM, 0);
-       if (sd < 0) {
-               fprintf(stderr,"error creating socket\n");
-               exit(1);
-       }
-       bzero((char *) &saddr, sizeof(struct sockaddr_in));
-       port = atoi(argv[1]);
-       saddr.sin_family = AF_INET;
-       saddr.sin_addr.s_addr = INADDR_ANY;
-       saddr.sin_port = htons(port);
-       if (bind(sd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
-               fprintf(stderr,"bind error\n");
-               exit(1);
-       }
-       listen(sd,5);
-       printf("started listening\n");
-       clen = sizeof(caddr);
-       new_sd = accept(sd, (struct sockaddr *) &caddr, &clen);
-       if (new_sd < 0) {
-               fprintf(stderr,"accept error\n");
-               exit(1);
-       }
-       printf("accepted connection\n");
-       bzero(buf,256);
-       numbytes = read(new_sd,buf,255);
-       if (numbytes < 0) {
-               fprintf(stderr,"read error\n");
-               exit(1);
-       }
-       printf("Message received: %s\n",buf);
-       strcpy(buf,"server received your message");
-       numbytes = write(new_sd, buf, 255);
-       if (numbytes < 0){
-               fprintf(stderr,"write error\n");
-               exit(1);
-       } 
-       close(new_sd);
-       close(sd);
-       exit(0); 
-}
-