From 67e65c3aff670e41b3c73f8c4a520820cef1798a Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Tue, 16 Mar 2010 16:57:17 +0000 Subject: [PATCH] Removed a bunch of compilation warnings. --- .../linuxtools/lttng/jni/JniMarker.java | 1 - .../linuxtools/lttng/jni/JniParser.java | 8 ---- .../linuxtools/lttng/jni/JniTracefile.java | 1 - .../lttng/jni/factory/JniTraceVersion.java | 1 - .../tmf/experiment/TmfExperiment.java | 40 +++++++++---------- 5 files changed, 20 insertions(+), 31 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java index 6999deb6f0..66d4b4253e 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java @@ -126,7 +126,6 @@ public abstract class JniMarker extends Jni_C_Common * @param markerName Name of the parent marker * @param markerFieldPtr C Pointer (converted in long) to marker_field C Structure */ - @SuppressWarnings("unused") private void addMarkerFieldFromC(String markerFieldName, long markerFieldPtr) { // Create a new Jaf_markerField object and insert it in the map // the maker field fill itself with LTT data while being constructed diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java index cc3bb22f95..d80fd23c77 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java @@ -156,7 +156,6 @@ public abstract class JniParser extends Jni_C_Common * @param stringToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addStringToParsingFromC(Object contentHolder, String stringToAdd) { ((ParsedObjectContent)contentHolder).setData( stringToAdd); } @@ -173,7 +172,6 @@ public abstract class JniParser extends Jni_C_Common * @param pointerToAdd The parsed data to add (in 64 bits long!) * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addLongPointerToParsingFromC(Object contentHolder, long pointerToAdd) { ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((long) pointerToAdd)); } @@ -190,7 +188,6 @@ public abstract class JniParser extends Jni_C_Common * @param pointerToAdd The parsed data to add (converted in 64 bits long!) * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addIntPointerToParsingFromC(Object contentHolder, long pointerToAdd) { ((ParsedObjectContent)contentHolder).setData( new Jni_C_Pointer((int) pointerToAdd)); } @@ -207,7 +204,6 @@ public abstract class JniParser extends Jni_C_Common * @param shortToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addShortToParsingFromC(Object contentHolder, short shortToAdd) { ((ParsedObjectContent)contentHolder).setData( new Short(shortToAdd)); } @@ -224,7 +220,6 @@ public abstract class JniParser extends Jni_C_Common * @param intToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addIntegerToParsingFromC(Object contentHolder, int intToAdd) { ((ParsedObjectContent)contentHolder).setData( new Integer(intToAdd)); } @@ -241,7 +236,6 @@ public abstract class JniParser extends Jni_C_Common * @param longToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addLongToParsingFromC(Object contentHolder, long longToAdd) { ((ParsedObjectContent)contentHolder).setData( new Long(longToAdd)); } @@ -258,7 +252,6 @@ public abstract class JniParser extends Jni_C_Common * @param floatToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addFloatToParsingFromC(Object contentHolder, float floatToAdd) { ((ParsedObjectContent)contentHolder).setData( new Float(floatToAdd)); } @@ -276,7 +269,6 @@ public abstract class JniParser extends Jni_C_Common * @param doubleToAdd The parsed data to add * @param formatToAdd The format of the raw data */ - @SuppressWarnings("unused") static private void addDoubleToParsingFromC(Object contentHolder, double doubleToAdd) { ((ParsedObjectContent)contentHolder).setData( new Double(doubleToAdd)); } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java index 869d23414b..e5eb9dbb3f 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTracefile.java @@ -262,7 +262,6 @@ public abstract class JniTracefile extends Jni_C_Common { * @param markerId Id of the marker (int) * @param markerInfoPtr C Pointer to a marker_info C structure */ - @SuppressWarnings("unused") private void addMarkersFromC(int markerId, long markerInfoPtr) { // Create a new tracefile object and insert it in the map // the tracefile fill itself with LTT data while being constructed diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java index dbaf9889c5..f808957db9 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java @@ -221,7 +221,6 @@ public class JniTraceVersion { /* * This function is be called from the C side to assign the version number the Java variable. */ - @SuppressWarnings("unused") private void setTraceVersionFromC(int newMajor, int newMinor) { majorNumber = newMajor; minorNumber = newMinor; diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java index bf702d190b..b01e8fb56d 100644 --- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java +++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/experiment/TmfExperiment.java @@ -591,26 +591,26 @@ public class TmfExperiment extends TmfEventProvider imple // Toubleshooting code // ======================================================================== - private void dumpCheckpoints() { - System.out.println("-----"); - System.out.println("Checkpoints of " + fExperimentId); - for (int i = 0; i < fCheckpoints.size(); i++) { - System.out.println("Entry:" + i); - TmfCheckpoint checkpoint = fCheckpoints.get(i); -// long rank = 0; - for (int j = 0; j < fTraces.length; j++) { - ITmfTrace trace = fTraces[j]; - TmfExperimentContext context = seekLocation(checkpoint.getLocation()); - TmfContext[] traces = context.getContexts(); -// rank += context.getRank(); - TmfEvent event = fTraces[j].getNextEvent(new TmfContext(traces[j])); -// System.out.println(" [" + trace.getName() + "] rank: " + context.getRank() + ", timestamp: " + event.getTimestamp()); - System.out.println(" [" + trace.getName() + "] timestamp: " + event.getTimestamp()); - assert (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0); - } -// System.out.println("Sum of ranks: " + rank + " (expected: " + i * fIndexPageSize + ")"); - } - } +// private void dumpCheckpoints() { +// System.out.println("-----"); +// System.out.println("Checkpoints of " + fExperimentId); +// for (int i = 0; i < fCheckpoints.size(); i++) { +// System.out.println("Entry:" + i); +// TmfCheckpoint checkpoint = fCheckpoints.get(i); +//// long rank = 0; +// for (int j = 0; j < fTraces.length; j++) { +// ITmfTrace trace = fTraces[j]; +// TmfExperimentContext context = seekLocation(checkpoint.getLocation()); +// TmfContext[] traces = context.getContexts(); +//// rank += context.getRank(); +// TmfEvent event = fTraces[j].getNextEvent(new TmfContext(traces[j])); +//// System.out.println(" [" + trace.getName() + "] rank: " + context.getRank() + ", timestamp: " + event.getTimestamp()); +// System.out.println(" [" + trace.getName() + "] timestamp: " + event.getTimestamp()); +// assert (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0); +// } +//// System.out.println("Sum of ranks: " + rank + " (expected: " + i * fIndexPageSize + ")"); +// } +// } // ------------------------------------------------------------------------ // Signal handlers -- 2.34.1