Skip to content

fix crash on windows 64, force sigar_set_pointer use 64bit pointer #142

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix crash on windows 64, force sigar_set_pointer use 64bit pointer #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e5dba8
force sigar_set_pointer use 64bit pointer
cnstar9988 Nov 20, 2020
6463839
sigar 1.6.4 win64 binary file.
cnstar9988 Mar 7, 2021
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
10 changes: 0 additions & 10 deletions bindings/java/src/jni/javasigar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,8 @@ static void *sigar_get_pointer(JNIEnv *env, jobject obj) {
jfieldID pointer_field;
jclass cls = JENV->GetObjectClass(env, obj);

#ifdef SIGAR_POINTER_LONG
pointer_field = JENV->GetFieldID(env, cls, "longSigarWrapper", "J");
return (void *)JENV->GetLongField(env, obj, pointer_field);
#else
pointer_field = JENV->GetFieldID(env, cls, "sigarWrapper", "I");
return (void *)JENV->GetIntField(env, obj, pointer_field);
#endif
}

static jni_sigar_t *sigar_get_jpointer(JNIEnv *env, jobject obj) {
Expand All @@ -218,13 +213,8 @@ static void sigar_set_pointer(JNIEnv *env, jobject obj, const void *ptr) {
jfieldID pointer_field;
jclass cls = JENV->GetObjectClass(env, obj);

#ifdef SIGAR_POINTER_LONG
pointer_field = JENV->GetFieldID(env, cls, "longSigarWrapper", "J");
JENV->SetLongField(env, obj, pointer_field, (jlong)ptr);
#else
pointer_field = JENV->GetFieldID(env, cls, "sigarWrapper", "I");
JENV->SetIntField(env, obj, pointer_field, (int)ptr);
#endif
}

/* for jni/win32 */
Expand Down
Binary file added sigar-amd64-winnt.dll
View file
Open in desktop
Binary file not shown.