Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use bindgen to auto generate ffi rust code #398

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+556 −2,452
Open

use bindgen to auto generate ffi rust code #398

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
942426c
use old c.h and bindgen to gen ffi rs code
fredbjer Nov 22, 2019
7f4b70e
fix conflicts
fredbjer Dec 4, 2019
d8239de
Merge branch 'master' into fredchenbj/bindgen_ffi
Connor1996 Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions librocksdb_sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ sse = ["libtitan_sys/sse"]
[build-dependencies]
cc = "1.0.3"
cmake = "0.1"
bindgen = "0.52"

[dependencies.jemalloc-sys]
version = "0.1.8"
Expand Down
12 changes: 12 additions & 0 deletions librocksdb_sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

extern crate bindgen;
extern crate cc;
extern crate cmake;

Expand Down Expand Up @@ -134,6 +135,17 @@ fn build_rocksdb() -> Build {
build.define("OS_FREEBSD", None);
}

let bindings = bindgen::Builder::default()
.header("crocksdb/crocksdb/c.h")
.ctypes_prefix("libc")
.generate()
.expect("unable to generate rocksdb bindings");

let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
bindings
.write_to_file(out_path.join("bindings.rs"))
.expect("unable to write rocksdb bindings");

let cur_dir = env::current_dir().unwrap();
build.include(cur_dir.join("rocksdb").join("include"));
build.include(cur_dir.join("rocksdb"));
Expand Down
51 changes: 27 additions & 24 deletions librocksdb_sys/crocksdb/c.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ struct crocksdb_sst_file_meta_data_t {
struct crocksdb_compaction_options_t {
CompactionOptions rep;
};
struct crocksdb_compaction_reason_t {
CompactionReason rep;
};

struct crocksdb_map_property_t {
std::map<std::string, std::string> rep;
Expand Down Expand Up @@ -746,7 +749,7 @@ crocksdb_t* crocksdb_open_column_families_with_ttl(
const char** column_family_names,
const crocksdb_options_t** column_family_options,
const int32_t* ttl_array,
bool read_only,
unsigned char read_only,
crocksdb_column_family_handle_t** column_family_handles,
char** errptr) {
std::vector<ColumnFamilyDescriptor> column_families;
Expand Down Expand Up @@ -1139,7 +1142,7 @@ void crocksdb_destroy_map_property(crocksdb_map_property_t* info) {
delete info;
}

bool crocksdb_get_map_property_cf(
unsigned char crocksdb_get_map_property_cf(
crocksdb_t* db,
crocksdb_column_family_handle_t* column_family,
const char* property,
Expand Down Expand Up @@ -1916,11 +1919,11 @@ const crocksdb_table_properties_t* crocksdb_flushjobinfo_table_properties(
&info->rep.table_properties);
}

bool crocksdb_flushjobinfo_triggered_writes_slowdown(const crocksdb_flushjobinfo_t* info) {
unsigned char crocksdb_flushjobinfo_triggered_writes_slowdown(const crocksdb_flushjobinfo_t* info) {
return info->rep.triggered_writes_slowdown;
}

bool crocksdb_flushjobinfo_triggered_writes_stop(const crocksdb_flushjobinfo_t* info) {
unsigned char crocksdb_flushjobinfo_triggered_writes_stop(const crocksdb_flushjobinfo_t* info) {
return info->rep.triggered_writes_stop;
}

Expand Down Expand Up @@ -2003,9 +2006,9 @@ uint64_t crocksdb_compactionjobinfo_total_output_bytes(
return info->rep.stats.total_output_bytes;
}

CompactionReason crocksdb_compactionjobinfo_compaction_reason(
const crocksdb_compaction_reason_t* crocksdb_compactionjobinfo_compaction_reason(
const crocksdb_compactionjobinfo_t* info) {
return info->rep.compaction_reason;
return reinterpret_cast<const crocksdb_compaction_reason_t*>(&info->rep.compaction_reason);
}

/* ExternalFileIngestionInfo */
Expand Down Expand Up @@ -2895,11 +2898,11 @@ void crocksdb_options_set_vector_memtable_factory(crocksdb_options_t* opt, uint6
opt->rep.memtable_factory.reset(new VectorRepFactory(reserved_bytes));
}

bool crocksdb_load_latest_options(const char* dbpath, crocksdb_env_t* env,
unsigned char crocksdb_load_latest_options(const char* dbpath, crocksdb_env_t* env,
crocksdb_options_t* db_options,
crocksdb_column_family_descriptor*** cf_descs,
size_t* cf_descs_len,
bool ignore_unknown_options, char** errptr) {
unsigned char ignore_unknown_options, char** errptr) {
std::vector<ColumnFamilyDescriptor> tmp_cf_descs;
Status s = rocksdb::LoadLatestOptions(dbpath, env->rep, &db_options->rep,
&tmp_cf_descs, ignore_unknown_options);
Expand Down Expand Up @@ -2934,7 +2937,7 @@ crocksdb_ratelimiter_t* crocksdb_ratelimiter_create_with_auto_tuned(
int64_t refill_period_us,
int32_t fairness,
crocksdb_ratelimiter_mode_t mode,
bool auto_tuned) {
unsigned char auto_tuned) {
crocksdb_ratelimiter_t* rate_limiter = new crocksdb_ratelimiter_t;
RateLimiter::Mode m = RateLimiter::Mode::kWritesOnly;
switch (mode) {
Expand Down Expand Up @@ -3437,7 +3440,7 @@ void crocksdb_lru_cache_options_set_num_shard_bits(
}

void crocksdb_lru_cache_options_set_strict_capacity_limit(
crocksdb_lru_cache_options_t* opt, bool strict_capacity_limit) {
crocksdb_lru_cache_options_t* opt, unsigned char strict_capacity_limit) {
opt->rep.strict_capacity_limit = strict_capacity_limit;
}

Expand Down Expand Up @@ -3785,7 +3788,7 @@ void crocksdb_ingest_external_file_cf(
SaveError(errptr, db->rep->IngestExternalFile(handle->rep, files, opt->rep));
}

bool crocksdb_ingest_external_file_optimized(
unsigned char crocksdb_ingest_external_file_optimized(
crocksdb_t* db, crocksdb_column_family_handle_t* handle,
const char* const* file_list, const size_t list_len,
const crocksdb_ingestexternalfileoptions_t* opt, char** errptr) {
Expand Down Expand Up @@ -3947,7 +3950,7 @@ void crocksdb_fifo_compaction_options_set_max_table_files_size(
}

void crocksdb_fifo_compaction_options_set_allow_compaction(
crocksdb_fifo_compaction_options_t* fifo_opts, bool allow_compaction) {
crocksdb_fifo_compaction_options_t* fifo_opts, unsigned char allow_compaction) {
fifo_opts->rep.allow_compaction = allow_compaction;
}

Expand Down Expand Up @@ -4026,7 +4029,7 @@ void crocksdb_delete_files_in_range(
crocksdb_t* db,
const char* start_key, size_t start_key_len,
const char* limit_key, size_t limit_key_len,
bool include_end, char** errptr) {
unsigned char include_end, char** errptr) {
Slice a, b;
SaveError(
errptr,
Expand All @@ -4041,7 +4044,7 @@ void crocksdb_delete_files_in_range_cf(
crocksdb_t* db, crocksdb_column_family_handle_t* column_family,
const char* start_key, size_t start_key_len,
const char* limit_key, size_t limit_key_len,
bool include_end, char** errptr) {
unsigned char include_end, char** errptr) {
Slice a, b;
SaveError(
errptr,
Expand All @@ -4056,7 +4059,7 @@ void crocksdb_delete_files_in_ranges_cf(
crocksdb_t* db, crocksdb_column_family_handle_t* cf,
const char* const* start_keys, const size_t* start_keys_lens,
const char* const* limit_keys, const size_t* limit_keys_lens,
size_t num_ranges, bool include_end, char** errptr) {
size_t num_ranges, unsigned char include_end, char** errptr) {
std::vector<Slice> starts(num_ranges);
std::vector<Slice> limits(num_ranges);
std::vector<RangePtr> ranges(num_ranges);
Expand Down Expand Up @@ -5246,12 +5249,12 @@ void ctitandb_decode_blob_index(const char* value, size_t value_size,
index->blob_size = bi.blob_handle.size;
}

void ctitandb_encode_blob_index(const ctitandb_blob_index_t& index,
void ctitandb_encode_blob_index(const ctitandb_blob_index_t* index,
char** value, size_t* value_size) {
BlobIndex bi;
bi.file_number = index.file_number;
bi.blob_handle.offset = index.blob_offset;
bi.blob_handle.size = index.blob_size;
bi.file_number = index->file_number;
bi.blob_handle.offset = index->blob_offset;
bi.blob_handle.size = index->blob_size;
std::string result;
bi.EncodeTo(&result);
*value = CopyString(result);
Expand Down Expand Up @@ -5372,12 +5375,12 @@ void ctitandb_readoptions_destroy(ctitandb_readoptions_t* opts) {
delete opts;
}

bool ctitandb_readoptions_key_only(ctitandb_readoptions_t* opts) {
unsigned char ctitandb_readoptions_key_only(ctitandb_readoptions_t* opts) {
return opts->rep.key_only;
}

void ctitandb_readoptions_set_key_only(ctitandb_readoptions_t* opts,
bool v) {
unsigned char v) {
opts->rep.key_only = v;
}

Expand Down Expand Up @@ -5449,7 +5452,7 @@ void ctitandb_delete_files_in_range(
crocksdb_t* db,
const char* start_key, size_t start_key_len,
const char* limit_key, size_t limit_key_len,
bool include_end, char** errptr) {
unsigned char include_end, char** errptr) {
Slice a, b;
RangePtr range(
start_key ? (a = Slice(start_key, start_key_len), &a) : nullptr,
Expand All @@ -5467,7 +5470,7 @@ void ctitandb_delete_files_in_range_cf(
crocksdb_t* db, crocksdb_column_family_handle_t* column_family,
const char* start_key, size_t start_key_len,
const char* limit_key, size_t limit_key_len,
bool include_end, char** errptr) {
unsigned char include_end, char** errptr) {
Slice a, b;
RangePtr range(
start_key ? (a = Slice(start_key, start_key_len), &a) : nullptr,
Expand All @@ -5485,7 +5488,7 @@ void ctitandb_delete_files_in_ranges_cf(
crocksdb_t* db, crocksdb_column_family_handle_t* cf,
const char* const* start_keys, const size_t* start_keys_lens,
const char* const* limit_keys, const size_t* limit_keys_lens,
size_t num_ranges, bool include_end, char** errptr) {
size_t num_ranges, unsigned char include_end, char** errptr) {
std::vector<Slice> starts(num_ranges);
std::vector<Slice> limits(num_ranges);
std::vector<RangePtr> ranges(num_ranges);
Expand Down
Loading