From efdf8947adaf9c7e8c3704885aec858d892eec31 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Jun 2009 14:22:18 -0700
Subject: [PATCH] common: kill obsolete common/ThreadPool.h

---
 src/Makefile.am         |   1 -
 src/common/ThreadPool.h | 140 ----------------------------------------
 2 files changed, 141 deletions(-)
 delete mode 100644 src/common/ThreadPool.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 58e9e68ea57..4622b9011da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -354,7 +354,6 @@ noinst_HEADERS = \
         common/Semaphore.h\
 	common/Spinlock.h\
         common/Thread.h\
-        common/ThreadPool.h\
         common/Timer.h\
         common/tls.h\
 	common/WorkQueue.h\
diff --git a/src/common/ThreadPool.h b/src/common/ThreadPool.h
deleted file mode 100644
index 636b4e50ed2..00000000000
--- a/src/common/ThreadPool.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software 
- * Foundation.  See file COPYING.
- * 
- */
-
-
-#ifndef THREADPOOL
-#define THREADPOOL
-
-#include <list>
-using std::list;
-
-
-#include <pthread.h>
-#include <common/Mutex.h>
-#include <common/Cond.h>
-#include <common/Semaphore.h>
-
-
-// debug output
-#include "config.h"
-#define tpdout(x) if (x <= g_conf.debug) *_dout << myname 
-#define DBLVL 15
-
-
-using namespace std;
- 
-#define MAX_THREADS 1000
-
-template <class U, class T>
-class ThreadPool {
-
- private:
-  list<T> q;
-  Mutex q_lock;
-  Semaphore q_sem;
-
-  int num_ops;
-  int num_threads;
-  vector<pthread_t> thread;
-
-  U u;
-  void (*func)(U,T);
-  void (*prefunc)(U,T);
-  string myname;
-
-  static void *foo(void *arg)
-  {
-    ThreadPool *t = (ThreadPool *)arg;
-    t->do_ops(arg);
-    return 0;
-  }
-
-  void *do_ops(void *nothing)
-  {
-    tpdout(DBLVL) << ".do_ops thread " << pthread_self() << " starting" << std::endl;
-    while (1) {
-      q_sem.Get();
-      if (q.empty()) break;
-
-      T op = get_op();
-      tpdout(DBLVL) << ".func thread "<< pthread_self() << " on " << op << std::endl;
-      func(u, op);
-    }
-    tpdout(DBLVL) << ".do_ops thread " << pthread_self() << " exiting" << std::endl;
-    return 0;
-  }
-
-
-  T get_op()
-  {
-    T op;
-    q_lock.Lock();
-    {
-      op = q.front();
-      q.pop_front();
-      num_ops--;
-      
-      if (prefunc && op) {
-        tpdout(DBLVL) << ".prefunc thread "<< pthread_self() << " on " << op << std::endl;
-        prefunc(u, op);
-      }
-    }
-    q_lock.Unlock();
-
-    return op;
-  }
-
- public:
-
-  ThreadPool(char *myname, int howmany, void (*f)(U,T), U obj, void (*pf)(U,T) = 0) :
-    q_lock("ThreadPool::q_lock"),
-    num_ops(0), num_threads(howmany), 
-    thread(num_threads),
-    u(obj),
-    func(f), prefunc(pf), 
-    myname(myname) {
-    tpdout(DBLVL) << ".cons num_threads " << num_threads << std::endl;
-    
-    // start threads
-    int status;
-    for(int i = 0; i < howmany; i++) {
-      status = pthread_create(&thread[i], NULL, (void*(*)(void *))&ThreadPool::foo, this);
-      assert(status == 0);
-    }
-  }
-  
-  ~ThreadPool() {
-    // bump sem to make threads exit cleanly
-    for(int i = 0; i < num_threads; i++) 
-      q_sem.Put();
-    
-    // wait for them to die
-    for(int i = 0; i < num_threads; i++) {
-      tpdout(DBLVL) << ".des joining thread " << thread[i] << std::endl;
-      void *rval = 0;  // we don't actually care
-      pthread_join(thread[i], &rval);
-    }
-  }
-  
-  void put_op(T op) {
-    tpdout(DBLVL) << ".put_op " << op << std::endl;
-    q_lock.Lock();
-    q.push_back(op);
-    num_ops++;
-    q_sem.Put();
-    q_lock.Unlock();
-  }
-
-};
-#endif