Browse Source
Update from upstream @21551990
* Patch LevelDB to build for OSX and iOS * Fix race condition in memtable iterator deletion. * Other small fixes. git-svn-id: https://leveldb.googlecode.com/svn/trunk@29 62dab493-f737-651d-591e-8d6aee1b9529xry
dgrogan@chromium.org
13 years ago
13 changed files with 381 additions and 45 deletions
Split View
Diff Options
-
+41 -4Makefile
-
+20 -0db/db_bench.cc
-
+28 -8db/db_impl.cc
-
+0 -4db/db_impl.h
-
+95 -0db/db_test.cc
-
+1 -1db/log_test.cc
-
+12 -21db/memtable.cc
-
+2 -0port/port.h
-
+50 -0port/port_osx.cc
-
+125 -0port/port_osx.h
-
+0 -1table/iterator.cc
-
+5 -6table/iterator_wrapper.h
-
+2 -0util/cache.cc
+ 41
- 4
Makefile
View File
+ 20
- 0
db/db_bench.cc
View File
+ 28
- 8
db/db_impl.cc
View File
+ 0
- 4
db/db_impl.h
View File
+ 95
- 0
db/db_test.cc
View File
+ 1
- 1
db/log_test.cc
View File
+ 12
- 21
db/memtable.cc
View File
+ 2
- 0
port/port.h
View File
+ 50
- 0
port/port_osx.cc
View File
| @ -0,0 +1,50 @@ | |||
| // Copyright (c) 2011 The LevelDB Authors. All rights reserved. | |||
| // Use of this source code is governed by a BSD-style license that can be | |||
| // found in the LICENSE file. See the AUTHORS file for names of contributors. | |||
| #include "port_osx.h" | |||
| #include <cstdlib> | |||
| #include <stdio.h> | |||
| #include <string.h> | |||
| #include "util/logging.h" | |||
| namespace leveldb { | |||
| namespace port { | |||
| static void PthreadCall(const char* label, int result) { | |||
| if (result != 0) { | |||
| fprintf(stderr, "pthread %s: %s\n", label, strerror(result)); | |||
| abort(); | |||
| } | |||
| } | |||
| Mutex::Mutex() { PthreadCall("init mutex", pthread_mutex_init(&mu_, NULL)); } | |||
| Mutex::~Mutex() { PthreadCall("destroy mutex", pthread_mutex_destroy(&mu_)); } | |||
| void Mutex::Lock() { PthreadCall("lock", pthread_mutex_lock(&mu_)); } | |||
| void Mutex::Unlock() { PthreadCall("unlock", pthread_mutex_unlock(&mu_)); } | |||
| CondVar::CondVar(Mutex* mu) | |||
| : mu_(mu) { | |||
| PthreadCall("init cv", pthread_cond_init(&cv_, NULL)); | |||
| } | |||
| CondVar::~CondVar() { PthreadCall("destroy cv", pthread_cond_destroy(&cv_)); } | |||
| void CondVar::Wait() { | |||
| PthreadCall("wait", pthread_cond_wait(&cv_, &mu_->mu_)); | |||
| } | |||
| void CondVar::Signal() { | |||
| PthreadCall("signal", pthread_cond_signal(&cv_)); | |||
| } | |||
| void CondVar::SignalAll() { | |||
| PthreadCall("broadcast", pthread_cond_broadcast(&cv_)); | |||
| } | |||
| } | |||
| } | |||
+ 125
- 0
port/port_osx.h
View File
| @ -0,0 +1,125 @@ | |||
| // Copyright (c) 2011 The LevelDB Authors. All rights reserved. | |||
| // Use of this source code is governed by a BSD-style license that can be | |||
| // found in the LICENSE file. See the AUTHORS file for names of contributors. | |||
| // | |||
| // See port_example.h for documentation for the following types/functions. | |||
| #ifndef STORAGE_LEVELDB_PORT_PORT_OSX_H_ | |||
| #define STORAGE_LEVELDB_PORT_PORT_OSX_H_ | |||
| #include <libkern/OSAtomic.h> | |||
| #include <machine/endian.h> | |||
| #include <pthread.h> | |||
| #include <stdint.h> | |||
| #include <string> | |||
| namespace leveldb { | |||
| // The following 4 methods implemented here for the benefit of env_posix.cc. | |||
| inline size_t fread_unlocked(void *a, size_t b, size_t c, FILE *d) { | |||
| return fread(a, b, c, d); | |||
| } | |||
| inline size_t fwrite_unlocked(const void *a, size_t b, size_t c, FILE *d) { | |||
| return fwrite(a, b, c, d); | |||
| } | |||
| inline int fflush_unlocked(FILE *f) { | |||
| return fflush(f); | |||
| } | |||
| inline int fdatasync(int fd) { | |||
| return fsync(fd); | |||
| } | |||
| namespace port { | |||
| static const bool kLittleEndian = (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN); | |||
| // ------------------ Threading ------------------- | |||
| // A Mutex represents an exclusive lock. | |||
| class Mutex { | |||
| public: | |||
| Mutex(); | |||
| ~Mutex(); | |||
| void Lock(); | |||
| void Unlock(); | |||
| void AssertHeld() { } | |||
| private: | |||
| friend class CondVar; | |||
| pthread_mutex_t mu_; | |||
| // No copying | |||
| Mutex(const Mutex&); | |||
| void operator=(const Mutex&); | |||
| }; | |||
| class CondVar { | |||
| public: | |||
| explicit CondVar(Mutex* mu); | |||
| ~CondVar(); | |||
| void Wait(); | |||
| void Signal(); | |||
| void SignalAll(); | |||
| private: | |||
| pthread_cond_t cv_; | |||
| Mutex* mu_; | |||
| }; | |||
| inline void MemoryBarrier() { | |||
| #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) | |||
| // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on | |||
| // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering. | |||
| __asm__ __volatile__("" : : : "memory"); | |||
| #else | |||
| OSMemoryBarrier(); | |||
| #endif | |||
| } | |||
| class AtomicPointer { | |||
| private: | |||
| void* ptr_; | |||
| public: | |||
| AtomicPointer() { } | |||
| explicit AtomicPointer(void* p) : ptr_(p) {} | |||
| inline void* Acquire_Load() const { | |||
| void* ptr = ptr_; | |||
| MemoryBarrier(); | |||
| return ptr; | |||
| } | |||
| inline void Release_Store(void* v) { | |||
| MemoryBarrier(); | |||
| ptr_ = v; | |||
| } | |||
| inline void* NoBarrier_Load() const { | |||
| return ptr_; | |||
| } | |||
| inline void NoBarrier_Store(void* v) { | |||
| ptr_ = v; | |||
| } | |||
| }; | |||
| inline bool Snappy_Compress(const char* input, size_t input_length, | |||
| std::string* output) { | |||
| return false; | |||
| } | |||
| inline bool Snappy_Uncompress(const char* input_data, size_t input_length, | |||
| std::string* output) { | |||
| return false; | |||
| } | |||
| inline bool GetHeapProfile(void (*func)(void*, const char*, int), void* arg) { | |||
| return false; | |||
| } | |||
| } | |||
| } | |||
| #endif // STORAGE_LEVELDB_PORT_PORT_OSX_H_ | |||