OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/leveldb/leveldb_service_impl.h" | 5 #include "components/leveldb/leveldb_service_impl.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "components/leveldb/env_mojo.h" | 10 #include "components/leveldb/env_mojo.h" |
11 #include "components/leveldb/leveldb_database_impl.h" | 11 #include "components/leveldb/leveldb_database_impl.h" |
12 #include "components/leveldb/public/cpp/util.h" | 12 #include "components/leveldb/public/cpp/util.h" |
13 #include "mojo/public/cpp/bindings/strong_associated_binding.h" | 13 #include "mojo/public/cpp/bindings/strong_associated_binding.h" |
14 #include "third_party/leveldatabase/env_chromium.h" | 14 #include "third_party/leveldatabase/env_chromium.h" |
15 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h" | 15 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h" |
16 #include "third_party/leveldatabase/src/include/leveldb/db.h" | 16 #include "third_party/leveldatabase/src/include/leveldb/db.h" |
17 #include "third_party/leveldatabase/src/include/leveldb/env.h" | 17 #include "third_party/leveldatabase/src/include/leveldb/env.h" |
18 #include "third_party/leveldatabase/src/include/leveldb/filter_policy.h" | 18 #include "third_party/leveldatabase/src/include/leveldb/filter_policy.h" |
19 #include "third_party/leveldatabase/src/include/leveldb/slice.h" | 19 #include "third_party/leveldatabase/src/include/leveldb/slice.h" |
20 | 20 |
21 namespace leveldb { | 21 namespace leveldb { |
22 | 22 |
23 LevelDBServiceImpl::LevelDBServiceImpl( | 23 LevelDBServiceImpl::LevelDBServiceImpl( |
24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) | 24 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) |
25 : thread_(new LevelDBMojoProxy(std::move(file_task_runner))), | 25 : env_(MojoEnv::Get(std::move(file_task_runner))) {} |
26 environment_name_("LevelDBEnv") {} | |
27 | 26 |
28 LevelDBServiceImpl::~LevelDBServiceImpl() {} | 27 LevelDBServiceImpl::~LevelDBServiceImpl() {} |
michaeln
2017/03/27 20:24:11
should UnregisterDirectory happen in this class?
Marijn Kruisselbrink
2017/03/31 23:26:24
All the open directories should be owned by some L
| |
29 | 28 |
30 void LevelDBServiceImpl::SetEnvironmentName(const std::string& name) { | |
31 environment_name_ = name; | |
32 } | |
33 | |
34 void LevelDBServiceImpl::Open( | 29 void LevelDBServiceImpl::Open( |
35 filesystem::mojom::DirectoryPtr directory, | 30 filesystem::mojom::DirectoryPtr directory, |
36 const std::string& dbname, | 31 const std::string& dbname, |
37 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, | 32 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, |
38 const OpenCallback& callback) { | 33 const OpenCallback& callback) { |
39 OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory), | 34 OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory), |
40 dbname, std::move(database), callback); | 35 dbname, std::move(database), callback); |
41 } | 36 } |
42 | 37 |
43 void LevelDBServiceImpl::OpenWithOptions( | 38 void LevelDBServiceImpl::OpenWithOptions( |
44 leveldb::mojom::OpenOptionsPtr open_options, | 39 leveldb::mojom::OpenOptionsPtr open_options, |
45 filesystem::mojom::DirectoryPtr directory, | 40 filesystem::mojom::DirectoryPtr directory, |
46 const std::string& dbname, | 41 const std::string& dbname, |
47 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, | 42 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, |
48 const OpenCallback& callback) { | 43 const OpenCallback& callback) { |
49 leveldb::Options options; | 44 leveldb::Options options; |
50 options.create_if_missing = open_options->create_if_missing; | 45 options.create_if_missing = open_options->create_if_missing; |
51 options.error_if_exists = open_options->error_if_exists; | 46 options.error_if_exists = open_options->error_if_exists; |
52 options.paranoid_checks = open_options->paranoid_checks; | 47 options.paranoid_checks = open_options->paranoid_checks; |
53 options.write_buffer_size = open_options->write_buffer_size; | 48 options.write_buffer_size = open_options->write_buffer_size; |
54 options.max_open_files = open_options->max_open_files; | 49 options.max_open_files = open_options->max_open_files; |
55 | 50 |
56 options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue; | 51 options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue; |
57 options.compression = leveldb::kSnappyCompression; | 52 options.compression = leveldb::kSnappyCompression; |
58 | 53 |
59 // Register our directory with the file thread. | 54 std::string prefix = env_->RegisterDirectory(std::move(directory)); |
60 LevelDBMojoProxy::OpaqueDir* dir = | 55 options.env = env_; |
61 thread_->RegisterDirectory(std::move(directory)); | |
62 | |
63 std::unique_ptr<MojoEnv> env_mojo( | |
64 new MojoEnv(environment_name_, thread_, dir)); | |
65 options.env = env_mojo.get(); | |
66 | 56 |
67 leveldb::DB* db = nullptr; | 57 leveldb::DB* db = nullptr; |
68 leveldb::Status s = leveldb::DB::Open(options, dbname, &db); | 58 leveldb::Status s = leveldb::DB::Open(options, prefix + dbname, &db); |
69 | 59 |
70 if (s.ok()) { | 60 if (s.ok()) { |
71 mojo::MakeStrongAssociatedBinding( | 61 mojo::MakeStrongAssociatedBinding( |
72 base::MakeUnique<LevelDBDatabaseImpl>(std::move(env_mojo), | 62 base::MakeUnique<LevelDBDatabaseImpl>(env_, std::move(prefix), |
73 base::WrapUnique(db)), | 63 base::WrapUnique(db)), |
74 std::move(database)); | 64 std::move(database)); |
75 } | 65 } |
76 | 66 |
77 callback.Run(LeveldbStatusToError(s)); | 67 callback.Run(LeveldbStatusToError(s)); |
78 } | 68 } |
79 | 69 |
80 void LevelDBServiceImpl::OpenInMemory( | 70 void LevelDBServiceImpl::OpenInMemory( |
81 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, | 71 leveldb::mojom::LevelDBDatabaseAssociatedRequest database, |
82 const OpenCallback& callback) { | 72 const OpenCallback& callback) { |
(...skipping 14 matching lines...) Expand all Loading... | |
97 std::move(database)); | 87 std::move(database)); |
98 } | 88 } |
99 | 89 |
100 callback.Run(LeveldbStatusToError(s)); | 90 callback.Run(LeveldbStatusToError(s)); |
101 } | 91 } |
102 | 92 |
103 void LevelDBServiceImpl::Destroy(filesystem::mojom::DirectoryPtr directory, | 93 void LevelDBServiceImpl::Destroy(filesystem::mojom::DirectoryPtr directory, |
104 const std::string& dbname, | 94 const std::string& dbname, |
105 const DestroyCallback& callback) { | 95 const DestroyCallback& callback) { |
106 leveldb::Options options; | 96 leveldb::Options options; |
107 // Register our directory with the file thread. | 97 std::string prefix = env_->RegisterDirectory(std::move(directory)); |
michaeln
2017/03/27 20:24:10
Does this leak a directory registration? Wdyt abou
Marijn Kruisselbrink
2017/03/31 23:26:24
Yeah, definitely agree that it would be nice to no
| |
108 LevelDBMojoProxy::OpaqueDir* dir = | 98 options.env = env_; |
109 thread_->RegisterDirectory(std::move(directory)); | 99 callback.Run( |
110 std::unique_ptr<MojoEnv> env_mojo( | 100 LeveldbStatusToError(leveldb::DestroyDB(prefix + dbname, options))); |
111 new MojoEnv(environment_name_, thread_, dir)); | |
112 options.env = env_mojo.get(); | |
113 callback.Run(LeveldbStatusToError(leveldb::DestroyDB(dbname, options))); | |
114 } | 101 } |
115 | 102 |
116 } // namespace leveldb | 103 } // namespace leveldb |
OLD | NEW |