pool/lttng-modules
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Update to version 2.6.2

Browse Source 
Drop patch: update-compaction-instrumentation-to-3.16-kernel.patch
  Drop patch: update-vmscan-instrumentation-to-3.16-kernel.patch
  Changelog: http://git.lttng.org/?p=lttng-modules.git;a=blob_plain;f=ChangeLog;hb=2df61b9e2079ac4b8f4bc984076b7057bc5d9254

OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-modules?expand=0&rev=13
This commit is contained in:
Tony Jones
2015-07-24 19:57:53 +00:00
committed by Git OBS Bridge
parent 5ea3709d32
commit 1903c30f9d
6 changed files with 12 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lttng-modules-2.5.0.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dfa268024834a4598bbd356d2ae7ea1e2ad828c625943ea5f5ead484e8ad82b
size 275319

3
lttng-modules-2.6.2.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35bd08685fd396c0788014cf69692a47ae837f526e68446e1c31130caa83dd83
size 293641

8
lttng-modules.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 24 19:44:52 UTC 2015 - tonyj@suse.com
- Update to version 2.6.2
Drop patch: update-compaction-instrumentation-to-3.16-kernel.patch
Drop patch: update-vmscan-instrumentation-to-3.16-kernel.patch
Changelog: http://git.lttng.org/?p=lttng-modules.git;a=blob_plain;f=ChangeLog;hb=2df61b9e2079ac4b8f4bc984076b7057bc5d9254
-------------------------------------------------------------------
Wed Aug 27 18:54:33 UTC 2014 - tonyj@suse.com

6
lttng-modules.spec
View File

@@ -21,12 +21,10 @@ Summary: Licensing information for package lttng-modules
License: GPL-2.0 and LGPL-2.1 and MIT
Group: System/Kernel
Name: lttng-modules
Version: 2.5.0
Version: 2.6.2
Release: 0.<RELEASE9>
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-preamble
Patch1: update-compaction-instrumentation-to-3.16-kernel.patch
Patch2: update-vmscan-instrumentation-to-3.16-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: kernel-devel
@@ -55,8 +53,6 @@ instrumenting kernel subsystems.
%prep
%setup
%patch1 -p1
%patch2 -p1
set -- *
mkdir source

81
update-compaction-instrumentation-to-3.16-kernel.patch
View File

@@ -1,81 +0,0 @@
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun Jul 13 13:33:21 2014 -0400
Subject: Update compaction instrumentation to 3.16 kernel
Git-repp: git://git.lttng.org/lttng-modules.git
Git-commit: 0007344741ef65259bc52dea72259173dfbf96c0
Signed-off-by: Tony Jones <tonyj@suse.de>
Update compaction instrumentation to 3.16 kernel
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h
index 1b237fa..22024e9 100644
--- a/instrumentation/events/lttng-module/compaction.h
+++ b/instrumentation/events/lttng-module/compaction.h
@@ -6,6 +6,7 @@
#include <linux/types.h>
#include <linux/tracepoint.h>
+#include <linux/version.h>
#include <trace/events/gfpflags.h>
DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
@@ -45,6 +46,48 @@ DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
TP_ARGS(nr_scanned, nr_taken)
)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+TRACE_EVENT(mm_compaction_migratepages,
+
+ TP_PROTO(unsigned long nr_all,
+ int migrate_rc,
+ struct list_head *migratepages),
+
+ TP_ARGS(nr_all, migrate_rc, migratepages),
+
+ TP_STRUCT__entry(
+ __field(unsigned long, nr_migrated)
+ __field(unsigned long, nr_failed)
+ ),
+
+ TP_fast_assign(
+ tp_assign(nr_migrated,
+ nr_all -
+ (migrate_rc >= 0 ? migrate_rc :
+ ({
+ unsigned long nr_failed = 0;
+ struct list_head *page_lru;
+
+ list_for_each(page_lru, migratepages)
+ nr_failed++;
+ nr_failed;
+ })))
+ tp_assign(nr_failed,
+ ({
+ unsigned long nr_failed = 0;
+ struct list_head *page_lru;
+
+ list_for_each(page_lru, migratepages)
+ nr_failed++;
+ nr_failed;
+ }))
+ ),
+
+ TP_printk("nr_migrated=%lu nr_failed=%lu",
+ __entry->nr_migrated,
+ __entry->nr_failed)
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
TRACE_EVENT(mm_compaction_migratepages,
TP_PROTO(unsigned long nr_migrated,
@@ -66,7 +109,7 @@ TRACE_EVENT(mm_compaction_migratepages,
__entry->nr_migrated,
__entry->nr_failed)
)
-
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
#endif /* _TRACE_COMPACTION_H */

68
update-vmscan-instrumentation-to-3.16-kernel.patch
View File

@@ -1,68 +0,0 @@
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun Jul 13 13:27:01 2014 -0400
Subject: Update vmscan instrumentation to 3.16 kernel
Git-repp: git://git.lttng.org/lttng-modules.git
Git-commit: 5defe623568273e9b87da1b817e373ff087fd862
Signed-off-by: Tony Jones <tonyj@suse.de>
Update vmscan instrumentation to 3.16 kernel
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
diff --git a/instrumentation/events/lttng-module/vmscan.h b/instrumentation/events/lttng-module/vmscan.h
index 1fd50ba..0b4aa56 100644
--- a/instrumentation/events/lttng-module/vmscan.h
+++ b/instrumentation/events/lttng-module/vmscan.h
@@ -238,6 +238,44 @@ TRACE_EVENT(mm_shrink_slab_start,
__entry->total_scan)
)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
+TRACE_EVENT(mm_shrink_slab_end,
+ TP_PROTO(struct shrinker *shr, int nid, int shrinker_retval,
+ long unused_scan_cnt, long new_scan_cnt, long total_scan),
+
+ TP_ARGS(shr, nid, shrinker_retval, unused_scan_cnt, new_scan_cnt,
+ total_scan),
+
+ TP_STRUCT__entry(
+ __field(struct shrinker *, shr)
+ __field(int, nid)
+ __field(void *, shrink)
+ __field(long, unused_scan)
+ __field(long, new_scan)
+ __field(int, retval)
+ __field(long, total_scan)
+ ),
+
+ TP_fast_assign(
+ tp_assign(shr, shr)
+ tp_assign(nid, nid)
+ tp_assign(shrink, shr->scan_objects)
+ tp_assign(unused_scan, unused_scan_cnt)
+ tp_assign(new_scan, new_scan_cnt)
+ tp_assign(retval, shrinker_retval)
+ tp_assign(total_scan, total_scan)
+ ),
+
+ TP_printk("%pF %p: nid %d unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
+ __entry->shrink,
+ __entry->shr,
+ __entry->nid,
+ __entry->unused_scan,
+ __entry->new_scan,
+ __entry->total_scan,
+ __entry->retval)
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
TRACE_EVENT(mm_shrink_slab_end,
TP_PROTO(struct shrinker *shr, int shrinker_retval,
long unused_scan_cnt, long new_scan_cnt),
@@ -274,6 +312,7 @@ TRACE_EVENT(mm_shrink_slab_end,
__entry->total_scan,
__entry->retval)
)
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) */
#endif
DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,