Remove deprecated/discouraged usages of JNA constructs (#102)

matthiasblaesing · neilcsmith-net · commit d7ab38f4294e · 2018-06-13T09:30:24.000+01:00
* Replace usage of Pointer#SIZE with Native#POINTER_SIZE

Pointer#SIZE will be removed from the JNA codebase (it is already
removed in master) as it is the root of class loading deadlocks.

* Replace deprecated usage of Pointer#getString and Pointer#setString

Pointer#setString(int offset, String value, boolean wide)

was replaced by the two methods:

Pointer#setString(int offset, String value)
and
Pointer#setWideString(int offset, String value)

The same holds true for the getter.
diff --git a/src/org/freedesktop/gstreamer/GObject.java b/src/org/freedesktop/gstreamer/GObject.java
@@ -356,7 +356,7 @@ private GObjectAPI.GParamSpec[] listProperties() {
 		int offset = 0;
 		for (int i = 0; i < len.getValue(); i++) {
 			props[i] = new GObjectAPI.GParamSpec(ptrs.getPointer(offset));
-			offset += Pointer.SIZE;
+			offset += Native.POINTER_SIZE;
 		}
 		return props;
 	}
diff --git a/src/org/freedesktop/gstreamer/Gst.java b/src/org/freedesktop/gstreamer/Gst.java
@@ -54,6 +54,7 @@
 import org.freedesktop.gstreamer.lowlevel.NativeObject;
 
 import com.sun.jna.Memory;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
@@ -84,18 +85,18 @@ public NativeArgs(String progname, String[] args) {
             // Allocate some native memory to pass the args down to the native layer
             //
             argsCopy = new Memory[args.length + 2];
-            argvMemory = new Memory(argsCopy.length * Pointer.SIZE);
+            argvMemory = new Memory(argsCopy.length * Native.POINTER_SIZE);
             
             //
             // Insert the program name as argv[0]
             //
             Memory arg = new Memory(progname.getBytes().length + 4);
-            arg.setString(0, progname, false);
+            arg.setString(0, progname);
             argsCopy[0] = arg;
             
             for (int i = 0; i < args.length; i++) {
                 arg = new Memory(args[i].getBytes().length + 1);
-                arg.setString(0, args[i], false);
+                arg.setString(0, args[i]);
                 argsCopy[i + 1] = arg;
             }
             argvMemory.write(0, argsCopy, 0, argsCopy.length);
@@ -109,9 +110,9 @@ String[] toStringArray() {
             List<String> args = new ArrayList<String>();
             Pointer argv = argvRef.getValue();
             for (int i = 1; i < argcRef.getValue(); i++) {
-                Pointer arg = argv.getPointer(i * Pointer.SIZE);
+                Pointer arg = argv.getPointer(i * Native.POINTER_SIZE);
                 if (arg != null) {
-                    args.add(arg.getString(0, false));
+                    args.add(arg.getString(0));
                 }
             }
             return args.toArray(new String[args.size()]);
diff --git a/src/org/freedesktop/gstreamer/TagList.java b/src/org/freedesktop/gstreamer/TagList.java
@@ -265,7 +265,7 @@ public Object get(TagList tl, String tag, int index) {
                     if (value[0] == null) {
                         return null;
                     }
-                    String ret = value[0].getString(0, false);
+                    String ret = value[0].getString(0);
                     GLIB_API.g_free(value[0]);
                     return ret;
                 }
diff --git a/src/org/freedesktop/gstreamer/lowlevel/BaseSinkAPI.java b/src/org/freedesktop/gstreamer/lowlevel/BaseSinkAPI.java
@@ -43,6 +43,7 @@
 
 import com.sun.jna.Callback;
 import com.sun.jna.Library;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 
 /**
@@ -220,7 +221,7 @@ public GstBaseSinkClass(Pointer ptr) {
         public RenderList render_list;
 
         /*< private >*/
-        public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * BaseSinkAPI.GST_PADDING_LARGE];
+        public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * BaseSinkAPI.GST_PADDING_LARGE];
 
         @Override
         protected List<String> getFieldOrder() {
diff --git a/src/org/freedesktop/gstreamer/lowlevel/BaseSrcAPI.java b/src/org/freedesktop/gstreamer/lowlevel/BaseSrcAPI.java
@@ -34,6 +34,7 @@
 
 import com.sun.jna.Callback;
 import com.sun.jna.Library;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.Union;
 import com.sun.jna.ptr.LongByReference;
@@ -229,7 +230,7 @@ public GstBaseSrcClass(Pointer ptr) {
         public PrepareSeek prepare_seek_segment;
         
         /*< private >*/
-        public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * (GST_PADDING_LARGE - 6)];
+        public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * (GST_PADDING_LARGE - 6)];
     
         @Override
         protected List<String> getFieldOrder() {
diff --git a/src/org/freedesktop/gstreamer/lowlevel/BaseTransformAPI.java b/src/org/freedesktop/gstreamer/lowlevel/BaseTransformAPI.java
@@ -33,6 +33,7 @@
 
 import com.sun.jna.Callback;
 import com.sun.jna.Library;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 import java.util.Arrays;
@@ -175,7 +176,7 @@ public GstBaseTransformClass(Pointer ptr) {
         public AcceptCaps accept_caps;
 
         /*< private >*/
-        public volatile byte[] _gst_reserved = new byte[Pointer.SIZE * (GST_PADDING_LARGE - 3)];
+        public volatile byte[] _gst_reserved = new byte[Native.POINTER_SIZE * (GST_PADDING_LARGE - 3)];
 
         @Override
         protected List<String> getFieldOrder() {
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GObjectAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GObjectAPI.java
@@ -31,6 +31,7 @@
 
 import com.sun.jna.Callback;
 import com.sun.jna.Library;
+import com.sun.jna.Native;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure.ByReference;
@@ -178,7 +179,7 @@ public static final class GObjectClass extends com.sun.jna.Structure {
         public Finalize finalize;
         public volatile Pointer dispatch_properties_changed;
         public Notify notify;
-        public volatile byte[] p_dummy = new byte[8 * Pointer.SIZE];
+        public volatile byte[] p_dummy = new byte[8 * Native.POINTER_SIZE];
         
         public static interface Constructor extends Callback {
             public Pointer callback(GType type, int n_construct_properties, 
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GTypeMapper.java b/src/org/freedesktop/gstreamer/lowlevel/GTypeMapper.java
@@ -37,6 +37,7 @@
 import com.sun.jna.FromNativeConverter;
 import com.sun.jna.MethodParameterContext;
 import com.sun.jna.MethodResultContext;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.StructureReadContext;
 import com.sun.jna.ToNativeContext;
@@ -230,7 +231,7 @@ public Object fromNative(Object arg0, FromNativeContext arg1) {
         }
 
         public Class<?> nativeType() {
-            return Pointer.SIZE == 8 ? Long.class : Integer.class;
+            return Native.POINTER_SIZE == 8 ? Long.class : Integer.class;
         }
     };
     private TypeConverter querytypeConverter = new TypeConverter() {
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GstAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GstAPI.java
@@ -23,6 +23,7 @@
 import org.freedesktop.gstreamer.lowlevel.annotations.CallerOwnsReturn;
 
 import com.sun.jna.Library;
+import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.PointerByReference;
@@ -87,7 +88,7 @@ public GstSegmentStruct(int flags, double rate, double applied_rate, Format form
         public long duration;
 
         /*< private >*/
-        public volatile byte[] _gst_reserved = new byte[(Pointer.SIZE * GST_PADDING) - (Double.SIZE / 8)];
+        public volatile byte[] _gst_reserved = new byte[(Native.POINTER_SIZE * GST_PADDING) - (Double.SIZE / 8)];
 
         @Override
         protected List<String> getFieldOrder() {
diff --git a/src/org/freedesktop/gstreamer/lowlevel/GstPadTemplateAPI.java b/src/org/freedesktop/gstreamer/lowlevel/GstPadTemplateAPI.java
@@ -19,6 +19,7 @@
 
 package org.freedesktop.gstreamer.lowlevel;
 
+import com.sun.jna.Native;
 import org.freedesktop.gstreamer.Caps;
 import org.freedesktop.gstreamer.Pad;
 import org.freedesktop.gstreamer.PadDirection;
@@ -29,8 +30,6 @@
 
 import com.sun.jna.Pointer;
 import com.sun.jna.PointerType;
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * GstPadTemplate functions
@@ -69,11 +68,11 @@ public String getName() {
         }
         
         public PadDirection getPadDirection() {
-            return PadDirection.values()[getPointer().getInt(Pointer.SIZE)];
+            return PadDirection.values()[getPointer().getInt(Native.POINTER_SIZE)];
         }
         
         public PadPresence getPadPresence() {
-            return PadPresence.values()[getPointer().getInt(Pointer.SIZE + 4)];
+            return PadPresence.values()[getPointer().getInt(Native.POINTER_SIZE + 4)];
         }
     }  
     
diff --git a/src/org/freedesktop/gstreamer/lowlevel/IntPtr.java b/src/org/freedesktop/gstreamer/lowlevel/IntPtr.java
@@ -17,13 +17,13 @@
  */
 package org.freedesktop.gstreamer.lowlevel;
 
-import com.sun.jna.Pointer;
+import com.sun.jna.Native;
 
 @SuppressWarnings("serial")
 public class IntPtr extends Number {
     public final Number value;
     public IntPtr(int value) {
-        this.value = Pointer.SIZE == 8 ? new Long(value) : new Integer(value);
+        this.value = Native.POINTER_SIZE == 8 ? new Long(value) : new Integer(value);
     }
     
     public String toString() {        

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ private GObjectAPI.GParamSpec[] listProperties() {`
`356`	`356`	`int offset = 0;`
`357`	`357`	`for (int i = 0; i < len.getValue(); i++) {`
`358`	`358`	`props[i] = new GObjectAPI.GParamSpec(ptrs.getPointer(offset));`
`359`		`- offset += Pointer.SIZE;`
	`359`	`+ offset += Native.POINTER_SIZE;`
`360`	`360`	`}`
`361`	`361`	`return props;`
`362`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public Object get(TagList tl, String tag, int index) {`
`265`	`265`	`if (value[0] == null) {`
`266`	`266`	`return null;`
`267`	`267`	`}`
`268`		`- String ret = value[0].getString(0, false);`
	`268`	`+ String ret = value[0].getString(0);`
`269`	`269`	`GLIB_API.g_free(value[0]);`
`270`	`270`	`return ret;`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`package org.freedesktop.gstreamer.lowlevel;`
`21`	`21`
	`22`	`+import com.sun.jna.Native;`
`22`	`23`	`import org.freedesktop.gstreamer.Caps;`
`23`	`24`	`import org.freedesktop.gstreamer.Pad;`
`24`	`25`	`import org.freedesktop.gstreamer.PadDirection;`
`@@ -29,8 +30,6 @@`
`29`	`30`
`30`	`31`	`import com.sun.jna.Pointer;`
`31`	`32`	`import com.sun.jna.PointerType;`
`32`		`-import java.util.Arrays;`
`33`		`-import java.util.List;`
`34`	`33`
`35`	`34`	`/**`
`36`	`35`	`* GstPadTemplate functions`
`@@ -69,11 +68,11 @@ public String getName() {`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`public PadDirection getPadDirection() {`
`72`		`- return PadDirection.values()[getPointer().getInt(Pointer.SIZE)];`
	`71`	`+ return PadDirection.values()[getPointer().getInt(Native.POINTER_SIZE)];`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`public PadPresence getPadPresence() {`
`76`		`- return PadPresence.values()[getPointer().getInt(Pointer.SIZE + 4)];`
	`75`	`+ return PadPresence.values()[getPointer().getInt(Native.POINTER_SIZE + 4)];`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`