*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@810 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/common/ThreadPool.h b/ceph/common/ThreadPool.h
index ee680e69c17dae137efb0f987bc75d1fb81fc324..6716a6c5378e8f56461ffc68cb2ff532a8e061c4 100644 (file)
--- a/ceph/common/ThreadPool.h
+++ b/ceph/common/ThreadPool.h
@@ -15,7 +15,10 @@
 #ifndef THREADPOOL
 #define THREADPOOL
 
-#include <queue>
+#include <list>
+using namespace std;
+
+
 #include <pthread.h>
 #include <common/Mutex.h>
 #include <common/Cond.h>
@@ -36,7 +39,7 @@ template <class U, class T>
 class ThreadPool {
 
  private:
-  queue<T> q;
+  list<T> q;
   Mutex q_lock;
   Semaphore q_sem;
 
@@ -78,7 +81,7 @@ class ThreadPool {
     q_lock.Lock();
        {
          op = q.front();
-         q.pop();
+         q.pop_front();
          num_ops--;
          
          if (prefunc && op) {
@@ -125,7 +128,7 @@ class ThreadPool {
   void put_op(T op) {
     tpdout(DBLVL) << ".put_op " << op << endl;
     q_lock.Lock();
-    q.push(op);
+    q.push_back(op);
     num_ops++;
     q_sem.Put();
     q_lock.Unlock();

diff --git a/ceph/include/buffer.h b/ceph/include/buffer.h
index cee60fd83ab7181cbc78c81a30d842d51d4a6110..2c76114054d3000c469b6467ebe7fd3678e0a769 100644 (file)
--- a/ceph/include/buffer.h
+++ b/ceph/include/buffer.h
@@ -316,7 +316,8 @@ class bufferptr {
        _len = len;                      // my len too
   }
   void zero() {
-       bzero((void*)c_str(), _len);
+       //bzero((void*)c_str(), _len);
+       memset((void*)c_str(), 0, _len);
   }
 
 

diff --git a/ceph/include/types.h b/ceph/include/types.h
index d339a4894ebfd303e90497d5f73d31913b3cc603..f6ab1830805bd047585b63fd0927bb8165e3afc1 100644 (file)
--- a/ceph/include/types.h
+++ b/ceph/include/types.h
@@ -11,7 +11,6 @@
  * 
  */
 
-
 #ifndef __MDS_TYPES_H
 #define __MDS_TYPES_H
 
@@ -29,6 +28,10 @@ using namespace std;
 using namespace __gnu_cxx;
 
 
+#ifndef __uint64_t
+typedef uint64_t __uint64_t;
+#endif
+
 #ifndef MIN
 # define MIN(a,b) ((a) < (b) ? (a):(b))
 #endif