Skip to content

Replaced CString with ffi utf util package #21

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

Merged
merged 4 commits into from
Sep 14, 2019
Merged

Replaced CString with ffi utf util package #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a94dd8
Replaced CString with ffi utf util package
Buggaboo Sep 13, 2019
bd71a4c
missed an unnecessary free
Buggaboo Sep 13, 2019
ca2678a
utf8 is already present via the ffi util
Buggaboo Sep 13, 2019
27769af
prevent memory leaks
Buggaboo Sep 13, 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
6 changes: 3 additions & 3 deletions lib/src/common.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "dart:ffi";

import "bindings/bindings.dart";
import "ffi/cstring.dart";
import "package:ffi/ffi.dart";

class Common {
static List<int> version() {
Expand All @@ -15,7 +15,7 @@ class Common {
}

static String versionString() {
return CString.fromPtr(bindings.obx_version_string()).val;
return Utf8.fromUtf8(bindings.obx_version_string().cast<Utf8>());
}

static String lastErrorString([err]) {
Expand All @@ -24,7 +24,7 @@ class Common {

int last = bindings.obx_last_error_code();
int last2 = bindings.obx_last_error_secondary();
String desc = CString.fromPtr(bindings.obx_last_error_message()).val;
String desc = Utf8.fromUtf8(bindings.obx_last_error_message().cast<Utf8>());
return "code $last, $last2 ($desc)";
}
}
Expand Down
38 changes: 0 additions & 38 deletions lib/src/ffi/cstring.dart
View file
Open in desktop

This file was deleted.

24 changes: 15 additions & 9 deletions lib/src/model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import "dart:ffi";

import "bindings/bindings.dart";
import "bindings/helpers.dart";
import "ffi/cstring.dart";

import "package:ffi/ffi.dart";

class Entity {
final int id, uid;
Expand Down Expand Up @@ -31,21 +32,26 @@ class Model {
// transform classes into model descriptions and loop through them
modelDefinitions.forEach((m) {
// start entity
var entityName = CString(m["entity"]["name"]);
var entityUtf8 = Utf8.toUtf8(m["entity"]["name"]);
try {
checkObx(bindings.obx_model_entity(_objectboxModel, entityName.ptr, m["entity"]["id"], m["entity"]["uid"]));
} finally {
entityName.free();
var entityNamePointer = entityUtf8.cast<Uint8>();
checkObx(bindings.obx_model_entity(
_objectboxModel, entityNamePointer, m["entity"]["id"],
m["entity"]["uid"]));
}finally {
// same pointer
entityUtf8.free();
}

// add all properties
m["properties"].forEach((p) {
var propertyName = CString(p["name"]);
var propertyUtf8 = Utf8.toUtf8(p["name"]);
try {
checkObx(bindings.obx_model_property(_objectboxModel, propertyName.ptr, p["type"], p["id"], p["uid"]));
var propertyNamePointer = propertyUtf8.cast<Uint8>();
checkObx(bindings.obx_model_property(_objectboxModel, propertyNamePointer, p["type"], p["id"], p["uid"]));
checkObx(bindings.obx_model_property_flags(_objectboxModel, p["flags"]));
} finally {
propertyName.free();
}finally {
propertyUtf8.free();
}
});

Expand Down
13 changes: 8 additions & 5 deletions lib/src/store.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ import "dart:ffi";

import "bindings/bindings.dart";
import "bindings/helpers.dart";
import "ffi/cstring.dart";

import "model.dart";

import "package:ffi/ffi.dart";



class Store {
Pointer<Void> _objectboxStore;
Map<Type, Map<String, dynamic>> _modelDefinitions = {};
Expand All @@ -20,11 +23,11 @@ class Store {
try {
checkObx(bindings.obx_opt_model(opt, model.ptr));
if (directory != null && directory.length != 0) {
var cStr = new CString(directory);
var cStr = Utf8.toUtf8(directory).cast<Uint8>();
try {
checkObx(bindings.obx_opt_directory(opt, cStr.ptr));
} finally {
cStr.free();
checkObx(bindings.obx_opt_directory(opt, cStr));
}finally {
cStr.free();
}
}
if (maxDBSizeInKB != null && maxDBSizeInKB > 0)
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ environment:
sdk: '>=2.5.0-dev.2.0 <3.0.0'
dependencies:
flat_buffers: ^1.11.0
utf: ^0.9.0
ffi: ^0.1.1
dev_dependencies:
build_runner: 1.0.0
objectbox_model_generator:
Expand Down