From: Filippos Giannakos <philipgian@grnet.gr>
Date: Thu, 14 Mar 2013 13:34:37 +0000 (+0200)
Subject: Remove unused stuff and reduce warnings
X-Git-Tag: 0.3~21^2
X-Git-Url: https://code.grnet.gr/git/archipelago/commitdiff_plain/cb5cf3017fad257a5e0682af908312c7e81ca9de

Remove unused stuff and reduce warnings

Remove unused pthread_* stuff and modify variable location to reduce warnings
because of the define-based compilation.
---

diff --git a/xseg/peers/user/peer.c b/xseg/peers/user/peer.c
index c0a0dd5..c68f5d1 100644
--- a/xseg/peers/user/peer.c
+++ b/xseg/peers/user/peer.c
@@ -77,48 +77,6 @@ uint32_t ta = 0;
 struct peerd *global_peer;
 static pthread_key_t threadkey;
 
-/*
-struct thread {
-	struct peerd *peer;
-	pthread_t tid;
-	pthread_cond_t cond;
-	pthread_mutex_t lock;
-	int thread_no;
-	void (*func)(void *arg);
-	void *arg;
-	void *priv;
-	struct xq free_thread_reqs;
-};
-*/
-inline static struct thread* alloc_thread(struct peerd *peer)
-{
-	xqindex idx = xq_pop_head(&peer->threads, 1);
-	if (idx == Noneidx)
-		return NULL;
-	return peer->thread + idx;
-}
-
-inline static void free_thread(struct peerd *peer, struct thread *t)
-{
-	xqindex idx = t - peer->thread;
-	xq_append_head(&peer->threads, idx, 1);
-}
-
-
-inline static void __wake_up_thread(struct thread *t)
-{
-	pthread_mutex_lock(&t->lock);
-	pthread_cond_signal(&t->cond);
-	pthread_mutex_unlock(&t->lock);
-}
-
-inline static void wake_up_thread(struct thread* t)
-{
-	if (t){
-		__wake_up_thread(t);
-	}
-}
-
 inline static int wake_up_next_thread(struct peerd *peer)
 {
 	return (xseg_signal(peer->xseg, peer->portno_start));
@@ -245,14 +203,14 @@ void log_pr(char *msg, struct peer_req *pr)
 inline struct peer_req *alloc_peer_req(struct peerd *peer, struct thread *t)
 {
 	struct peer_req *pr;
-	struct thread *nt;
-	int i;
 	xqindex idx = xq_pop_head(&t->free_thread_reqs, t->thread_no);
 	if (idx != Noneidx)
 		goto out;
 
 	/* try to steal from another thread */
 	/*
+	int i;
+	struct thread *nt;
 	for (i = t->thread_no + 1; i < (t->thread_no + peer->nr_threads); i++) {
 		nt = &peer->thread[(t->thread_no + i) % peer->nr_threads];
 		if (!xq_count(&nt->free_thread_reqs))
@@ -303,8 +261,8 @@ inline void free_peer_req(struct peerd *peer, struct peer_req *pr)
 int all_peer_reqs_free(struct peerd *peer)
 {
 	uint32_t free_reqs = 0;
-	int i;
 #ifdef MT
+	int i;
 	for (i = 0; i < peer->nr_threads; i++) {
 		free_reqs += xq_count(&peer->thread[i].free_thread_reqs);
 	}
@@ -551,11 +509,8 @@ int peerd_start_threads(struct peerd *peer)
 	uint32_t nr_threads = peer->nr_threads;
 	//TODO err check
 	for (i = 0; i < nr_threads; i++) {
-		peer->thread[i].func = NULL;
-		peer->thread[i].arg = NULL;
+		peer->thread[i].thread_no = i;
 		peer->thread[i].peer = peer;
-		pthread_cond_init(&peer->thread[i].cond,NULL);
-		pthread_mutex_init(&peer->thread[i].lock, NULL);
 		pthread_create(&peer->thread[i].tid, NULL,
 					init_thread_loop, (void *)(peer->thread + i));
 	}
@@ -617,16 +572,6 @@ static int generic_peerd_loop(void *arg)
 	xseg_init_local_signal(xseg, peer->portno_start);
 	//for (;!(isTerminate() && xq_count(&peer->free_reqs) == peer->nr_ops);) {
 	for (;!(isTerminate() && all_peer_reqs_free(peer));) {
-#ifdef MT
-		if (t->func) {
-			XSEGLOG2(&lc, D, "%s executes function\n", id);
-			xseg_cancel_wait(xseg, peer->portno_start);
-			t->func(t->arg);
-			t->func = NULL;
-			t->arg = NULL;
-			continue;
-		}
-#endif
 		//Heart of peerd_loop. This loop is common for everyone.
 		for(loops = threshold; loops > 0; loops--) {
 			if (loops == 1)
@@ -704,8 +649,6 @@ static struct peerd* peerd_init(uint32_t nr_ops, char* spec, long portno_start,
 	if (!xq_alloc_empty(&peer->threads, nr_threads))
 		goto malloc_fail;
 	for (i = 0; i < nr_threads; i++) {
-		peer->thread[i].thread_no = i;
-		peer->thread[i].peer = peer;
 		if (!xq_alloc_empty(&peer->thread[i].free_thread_reqs, nr_ops))
 			goto malloc_fail;
 	}
diff --git a/xseg/peers/user/peer.h b/xseg/peers/user/peer.h
index 77abb83..0542261 100644
--- a/xseg/peers/user/peer.h
+++ b/xseg/peers/user/peer.h
@@ -89,15 +89,12 @@ struct peer_req {
 };
 
 struct thread {
-	struct peerd *peer;
 	pthread_t tid;
-	pthread_cond_t cond;
-	pthread_mutex_t lock;
+	struct peerd *peer;
 	int thread_no;
-	void (*func)(void *arg);
-	void *arg;
-	void *priv;
 	struct xq free_thread_reqs;
+	void *priv;
+	void *arg;
 };
 
 struct peerd {