Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Montplaisir2015-02-20 00:06:53 +0000
committerAlexandre Montplaisir2015-02-25 06:03:18 +0000
commitdf8921d7a1c43b828fc59386571b1148bafc7309 (patch)
tree5c6f5f88f700b3b866137b3c98ad68477678b3aa
parentb7d58960198700c280e697b44e614f139332af88 (diff)
downloadorg.eclipse.tracecompass-df8921d7a1c43b828fc59386571b1148bafc7309.tar.gz
org.eclipse.tracecompass-df8921d7a1c43b828fc59386571b1148bafc7309.tar.xz
org.eclipse.tracecompass-df8921d7a1c43b828fc59386571b1148bafc7309.zip
Update XML test traces to use long's instead of int's
The "prev_prio" and "next_prio" fields of CTF traces (as a matter of a fact, *all* CTF integer fields) are interpreted as long's by the CTF parser. To keep this consistent in the state providers, update the XML test traces to use longs for these fields. Change-Id: I3e2cf4793925ac769c5e1cf099ff51686779bed3 Signed-off-by: Christian Mansky <christian.mansky@gmx.at> Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im> Reviewed-on: https://git.eclipse.org/r/42250 Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
-rw-r--r--org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/cpu_analysis.xml32
-rw-r--r--org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/lttng_kernel_analysis.xml28
-rw-r--r--org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/guest.xml28
-rw-r--r--org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/host.xml20
4 files changed, 54 insertions, 54 deletions
diff --git a/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/cpu_analysis.xml b/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/cpu_analysis.xml
index e403f3c76a..01faef4aa8 100644
--- a/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/cpu_analysis.xml
+++ b/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/cpu_analysis.xml
@@ -6,80 +6,80 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="proc1" type="string" />
<field name="prev_tid" value="1" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc2" type="string" />
<field name="next_tid" value="2" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="2" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc3" type="string" />
<field name="prev_tid" value="3" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc4" type="string" />
<field name="next_tid" value="4" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="5" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc4" type="string" />
<field name="prev_tid" value="4" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc3" type="string" />
<field name="next_tid" value="3" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="10" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc3" type="string" />
<field name="prev_tid" value="3" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc4" type="string" />
<field name="next_tid" value="4" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="15" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc4" type="string" />
<field name="prev_tid" value="4" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc1" type="string" />
<field name="next_tid" value="1" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="20" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc1" type="string" />
<field name="prev_tid" value="1" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc4" type="string" />
<field name="next_tid" value="4" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="20" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="proc2" type="string" />
<field name="prev_tid" value="2" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc3" type="string" />
<field name="next_tid" value="3" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="25" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="proc3" type="string" />
<field name="prev_tid" value="3" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc2" type="string" />
<field name="next_tid" value="2" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
</trace> \ No newline at end of file
diff --git a/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/lttng_kernel_analysis.xml b/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/lttng_kernel_analysis.xml
index b7a2c0481a..40f7efcfdb 100644
--- a/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/lttng_kernel_analysis.xml
+++ b/org.eclipse.tracecompass.analysis.os.linux.core.tests/testfiles/lttng_kernel_analysis.xml
@@ -55,11 +55,11 @@
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc3" type="string" />
<field name="prev_tid" value="30" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc11" type="string" />
<field name="next_tid" value="11" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="15" name="lttng_statedump_process_state">
<field name="cpu" value="0" type="int" />
@@ -83,11 +83,11 @@
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc11" type="string" />
<field name="prev_tid" value="10" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc20" type="string" />
<field name="next_tid" value="20" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="25" name="sched_process_fork">
<field name="cpu" value="1" type="int" />
@@ -102,50 +102,50 @@
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc20" type="string" />
<field name="prev_tid" value="20" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc21" type="string" />
<field name="next_tid" value="21" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="35" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="lttng-sessiond" type="string" />
<field name="prev_tid" value="100" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc11" type="string" />
<field name="next_tid" value="11" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="50" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc21" type="string" />
<field name="prev_tid" value="21" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc30" type="string" />
<field name="next_tid" value="30" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="60" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc30" type="string" />
<field name="prev_tid" value="30" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc21" type="string" />
<field name="next_tid" value="21" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="70" name="sched_switch">
<field name="cpu" value="1" type="int" />
<field name="prev_comm" value="proc21" type="string" />
<field name="prev_tid" value="21" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="proc20" type="string" />
<field name="next_tid" value="20" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
</trace> \ No newline at end of file
diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/guest.xml b/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/guest.xml
index 10757300e8..fc973d3a5a 100644
--- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/guest.xml
+++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/guest.xml
@@ -6,21 +6,21 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="130" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any2" type="string" />
<field name="next_tid" value="131" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="35" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any2" type="string" />
<field name="prev_tid" value="131" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any" type="string" />
<field name="next_tid" value="130" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="40" name="vmsync_gh_guest">
<field name="cpu" value="0" type="int" />
@@ -36,21 +36,21 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="130" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any2" type="string" />
<field name="next_tid" value="131" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="175" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any2" type="string" />
<field name="prev_tid" value="131" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any" type="string" />
<field name="next_tid" value="130" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="190" name="vmsync_gh_guest">
<field name="cpu" value="0" type="int" />
@@ -66,11 +66,11 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="130" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any2" type="string" />
<field name="next_tid" value="131" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="240" name="vmsync_gh_guest">
<field name="cpu" value="0" type="int" />
@@ -86,20 +86,20 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any2" type="string" />
<field name="prev_tid" value="131" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any" type="string" />
<field name="next_tid" value="130" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="375" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="130" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any2" type="string" />
<field name="next_tid" value="131" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
</trace> \ No newline at end of file
diff --git a/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/host.xml b/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/host.xml
index 97db30f597..c26e8367f7 100644
--- a/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/host.xml
+++ b/org.eclipse.tracecompass.lttng2.kernel.core.tests/testfiles/vm/OneQemuKvm/host.xml
@@ -6,11 +6,11 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="30" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="qemucpu1" type="string" />
<field name="next_tid" value="31" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="5" name="kvm_entry">
<field name="cpu" value="0" type="int" />
@@ -50,21 +50,21 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="qemucpu1" type="string" />
<field name="prev_tid" value="31" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any" type="string" />
<field name="next_tid" value="30" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="150" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="30" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="qemucpu1" type="string" />
<field name="next_tid" value="31" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="155" name="kvm_entry">
<field name="cpu" value="0" type="int" />
@@ -126,21 +126,21 @@
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="qemucpu1" type="string" />
<field name="prev_tid" value="31" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="any" type="string" />
<field name="next_tid" value="30" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="350" name="sched_switch">
<field name="cpu" value="0" type="int" />
<field name="prev_comm" value="any" type="string" />
<field name="prev_tid" value="30" type="long" />
-<field name="prev_prio" value="20" type="int" />
+<field name="prev_prio" value="20" type="long" />
<field name="prev_state" value="0" type="long" />
<field name="next_comm" value="qemucpu1" type="string" />
<field name="next_tid" value="31" type="long" />
-<field name="next_prio" value="20" type="int" />
+<field name="next_prio" value="20" type="long" />
</event>
<event timestamp="355" name="kvm_entry">
<field name="cpu" value="0" type="int" />

Back to the top