Browse Source
Speed up Snappy uncompression, new Logger interface.
- Removed one copy of an uncompressed block contents changing
the signature of Snappy_Uncompress() so it uncompresses into a
flat array instead of a std::string.
Speeds up readrandom ~10%.
- Instead of a combination of Env/WritableFile, we now have a
Logger interface that can be easily overridden applications
that want to supply their own logging.
- Separated out the gcc and Sun Studio parts of atomic_pointer.h
so we can use 'asm', 'volatile' keywords for Sun Studio.
git-svn-id: https://leveldb.googlecode.com/svn/trunk@39 62dab493-f737-651d-591e-8d6aee1b9529
naive_version
gabor@google.com
13 years ago
17 changed files with 261 additions and 212 deletions
Unified View
Diff Options
-
+4 -3db/db_bench.cc
-
+17 -28db/db_impl.cc
-
+10 -10db/repair.cc
-
+2 -2db/version_set.cc
-
+23 -6include/leveldb/env.h
-
+3 -3include/leveldb/options.h
-
+11 -3port/atomic_pointer.h
-
+7 -1port/port_android.h
-
+11 -7port/port_chromium.cc
-
+3 -1port/port_chromium.h
-
+11 -1port/port_example.h
-
+15 -11port/port_posix.h
-
+12 -8table/format.cc
-
+10 -5util/env.cc
-
+13 -61util/env_chromium.cc
-
+12 -62util/env_posix.cc
-
+97 -0util/posix_logger.h
+ 4
- 3
db/db_bench.cc
View File
+ 17
- 28
db/db_impl.cc
View File
+ 10
- 10
db/repair.cc
View File
+ 2
- 2
db/version_set.cc
View File
+ 23
- 6
include/leveldb/env.h
View File
+ 3
- 3
include/leveldb/options.h
View File
+ 11
- 3
port/atomic_pointer.h
View File
+ 7
- 1
port/port_android.h
View File
+ 11
- 7
port/port_chromium.cc
View File
+ 3
- 1
port/port_chromium.h
View File
+ 11
- 1
port/port_example.h
View File
+ 15
- 11
port/port_posix.h
View File
+ 12
- 8
table/format.cc
View File
+ 10
- 5
util/env.cc
View File
+ 13
- 61
util/env_chromium.cc
View File
+ 12
- 62
util/env_posix.cc
View File
+ 97
- 0
util/posix_logger.h
View File
| @ -0,0 +1,97 @@ | |||||
| // Copyright 2011 Google Inc. All Rights Reserved. | |||||
| // Author: sanjay@google.com (Sanjay Ghemawat) | |||||
| // | |||||
| // Logger implementation that can be shared by all environments | |||||
| // where enough posix functionality is available. | |||||
| #ifndef STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_ | |||||
| #define STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_ | |||||
| #include <algorithm> | |||||
| #include <stdio.h> | |||||
| #include <sys/time.h> | |||||
| #include <time.h> | |||||
| #include "leveldb/env.h" | |||||
| namespace leveldb { | |||||
| class PosixLogger : public Logger { | |||||
| private: | |||||
| FILE* file_; | |||||
| uint64_t (*gettid_)(); // Return the thread id for the current thread | |||||
| public: | |||||
| PosixLogger(FILE* f, uint64_t (*gettid)()) : file_(f), gettid_(gettid) { } | |||||
| virtual ~PosixLogger() { | |||||
| fclose(file_); | |||||
| } | |||||
| virtual void Logv(const char* format, va_list ap) { | |||||
| const uint64_t thread_id = (*gettid_)(); | |||||
| // We try twice: the first time with a fixed-size stack allocated buffer, | |||||
| // and the second time with a much larger dynamically allocated buffer. | |||||
| char buffer[500]; | |||||
| for (int iter = 0; iter < 2; iter++) { | |||||
| char* base; | |||||
| int bufsize; | |||||
| if (iter == 0) { | |||||
| bufsize = sizeof(buffer); | |||||
| base = buffer; | |||||
| } else { | |||||
| bufsize = 30000; | |||||
| base = new char[bufsize]; | |||||
| } | |||||
| char* p = base; | |||||
| char* limit = base + bufsize; | |||||
| struct timeval now_tv; | |||||
| gettimeofday(&now_tv, NULL); | |||||
| const time_t seconds = now_tv.tv_sec; | |||||
| struct tm t; | |||||
| localtime_r(&seconds, &t); | |||||
| p += snprintf(p, limit - p, | |||||
| "%04d/%02d/%02d-%02d:%02d:%02d.%06d %llx ", | |||||
| t.tm_year + 1900, | |||||
| t.tm_mon + 1, | |||||
| t.tm_mday, | |||||
| t.tm_hour, | |||||
| t.tm_min, | |||||
| t.tm_sec, | |||||
| static_cast<int>(now_tv.tv_usec), | |||||
| static_cast<long long unsigned int>(thread_id)); | |||||
| // Print the message | |||||
| if (p < limit) { | |||||
| va_list backup_ap; | |||||
| va_copy(backup_ap, ap); | |||||
| p += vsnprintf(p, limit - p, format, backup_ap); | |||||
| va_end(backup_ap); | |||||
| } | |||||
| // Truncate to available space if necessary | |||||
| if (p >= limit) { | |||||
| if (iter == 0) { | |||||
| continue; // Try again with larger buffer | |||||
| } else { | |||||
| p = limit - 1; | |||||
| } | |||||
| } | |||||
| // Add newline if necessary | |||||
| if (p == base || p[-1] != '\n') { | |||||
| *p++ = '\n'; | |||||
| } | |||||
| assert(p <= limit); | |||||
| fwrite(base, 1, p - base, file_); | |||||
| fflush(file_); | |||||
| if (base != buffer) { | |||||
| delete[] base; | |||||
| } | |||||
| break; | |||||
| } | |||||
| } | |||||
| }; | |||||
| } | |||||
| #endif // STORAGE_LEVELDB_UTIL_POSIX_LOGGER_H_ | |||||