Skip to content

Provided the support of shared pointer with example #57

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

Closed
ossdev07 wants to merge 12 commits into from
+63 −16
Closed

Provided the support of shared pointer with example #57

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c72b806
Hawtjni: Provided the support of shared pointer with example
ossdev07 Apr 29, 2019
9637909
Update StructsGenerator.java
ossdev07 Jun 18, 2019
f91adf2
Update ReflectField.java
ossdev07 Jun 18, 2019
88bc56b
Update StructsGenerator.java
ossdev07 Jun 18, 2019
1e3eb26
Update ReflectField.java
ossdev07 Jul 1, 2019
12c8b29
Update StructsGenerator.java
ossdev07 Jul 1, 2019
a7af3f9
Hawtjni: added Hawtjni example for shared_ptr
ossdev07 Aug 23, 2019
7c4d2f3
Update Example.java
ossdev07 Nov 14, 2019
44bb822
Update foo.cpp
ossdev07 Nov 14, 2019
8ec40c5
Update foo.h
ossdev07 Nov 14, 2019
968ef79
Update StructsGenerator.java
ossdev07 Nov 14, 2019
e600e6a
haetjni - shared_ptr_support: Improved shared pointer code generation…
ossdev07 Mar 30, 2020
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
3 changes: 3 additions & 0 deletions hawtjni-example/src/main/java/test/Example.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public static final void main(String args[]) {
public static int O_WRONLY;
@JniField(flags={CONSTANT})
public static int O_RDWR;

@JniField(flags={SHARED_PTR})
public static int CheckStr;

@JniMethod(cast="void *")
public static final native long malloc(
Expand Down
95 changes: 66 additions & 29 deletions hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/StructsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,41 +290,78 @@ void generateGetFields(JNIClass clazz) {
JNIFieldAccessor accessor = field.getAccessor();
output("\t");
if (type.isPrimitive()) {
if (!accessor.isNonMemberSetter())
output("lpStruct->");
if (accessor.isMethodSetter()) {
String setterStart = accessor.setter().split("\\(")[0];
output(setterStart + "(");
if (accessor.isNonMemberSetter())
output("lpStruct, ");
} else {
output(accessor.setter());
if (field.isSharedPointer()) {
output("\tlpStruct->");
output(accessor.getter());
output(" = ");
}
output(field.getCast());
if (field.isPointer()) {
output("std::shared_ptr");
output("<");
methodname = field.getCast();
String method = methodname.replace("*", ">");
method = method.replace("(", "");
method = method.replace(")", "");
output(method);
output("(");
output(field.getCast());
output("(intptr_t)");
}
if (isCPP) {
output("env->Get");
} else {
output("(*env)->Get");
}
output(type.getTypeSignature1(!type.equals(type64)));
if (isCPP) {
output("Field(lpObject, ");
} else {
output("Field(env, lpObject, ");
}
output(field.getDeclaringClass().getSimpleName());
output("Fc.");
output(field.getName());
if (accessor.isMethodSetter())
if (isCPP) {
output("env->Get");
} else {
output("(*env)->Get");
}
output(type.getTypeSignature1(!type.equals(type64)));
if (isCPP) {
output("Field(lpObject, ");
} else {
output("Field(env, lpObject, ");
}
output(field.getDeclaringClass().getSimpleName());
output("Fc.");
output(field.getName());
output(")");
output(");");
output(");");
} else {
if (!accessor.isNonMemberSetter())
output("lpStruct->");
if (accessor.isMethodSetter()) {
String setterStart = accessor.setter().split("\\(")[0];
output(setterStart + "(");
if (accessor.isNonMemberSetter())
output("lpStruct, ");
} else {
output(accessor.setter());
output(" = ");
}
output(field.getCast());
if (field.isPointer()) {
output("(intptr_t)");
}
if (isCPP) {
output("env->Get");
} else {
output("(*env)->Get");
}
output(type.getTypeSignature1(!type.equals(type64)));
if (isCPP) {
output("Field(lpObject, ");
} else {
output("Field(env, lpObject, ");
}
output(field.getDeclaringClass().getSimpleName());
output("Fc.");
output(field.getName());
if (accessor.isMethodSetter())
output(")");
output(");");
}
} else if (type.isArray()) {
JNIType componentType = type.getComponentType(), componentType64 = type64.getComponentType();
if (componentType.isPrimitive()) {
if ( field.isSharedPointer() ) {
output("(&");
output("lpStruct->"+accessor);
output("));");
}
outputln("{");
output("\t");
output(type.getTypeSignature2(!type.equals(type64)));
Expand Down
1 change: 1 addition & 0 deletions hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/JNIField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ public interface JNIField {
public String getConditional();
public boolean ignore();

public boolean isSharedPointer();
public boolean isPointer();
}
7 changes: 7 additions & 0 deletions hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ public boolean isPointer() {
return getFlag(POINTER_FIELD) || ( type.getWrappedClass() == Long.TYPE && getCast().endsWith("*") );
}

public boolean isSharedPointer() {
if (annotation == null) {
return false;
}
return getFlag(SHARED_PTR);
}

public String getConditional() {
String parentConditional = getDeclaringClass().getConditional();
String myConditional = annotation == null ? null : emptyFilter(annotation.conditional());
Expand Down
6 changes: 6 additions & 0 deletions hawtjni-runtime/src/main/java/org/fusesource/hawtjni/runtime/FieldFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ public enum FieldFlag {
*/
POINTER_FIELD,

/**
* Indicate that the field is a shared pointer.
*/

SHARED_PTR,

/**
* Indicate that the getter method used is not part of
* the structure. Useful for using wrappers to access
Expand Down