summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Ostorga <vostorga@gentoo.org>2009-11-02 23:21:49 +0000
committerVictor Ostorga <vostorga@gentoo.org>2009-11-02 23:21:49 +0000
commitd4ff708ed425fe94e8acd4c4721d4f196a21d9ca (patch)
treede5220b9367470e59c203b28140faf29d64fbf7c /sys-apps
parentversion bump, by Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>, bug #... (diff)
downloadhistorical-d4ff708ed425fe94e8acd4c4721d4f196a21d9ca.tar.gz
historical-d4ff708ed425fe94e8acd4c4721d4f196a21d9ca.tar.bz2
historical-d4ff708ed425fe94e8acd4c4721d4f196a21d9ca.zip
sys-apps/sreadahead removal (Pending 2009-10-31), see #257207 for reference.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/sreadahead/ChangeLog26
-rw-r--r--sys-apps/sreadahead/Manifest7
-rw-r--r--sys-apps/sreadahead/files/0001-kernel-trace-open.patch251
-rw-r--r--sys-apps/sreadahead/files/sreadahead.rc19
-rw-r--r--sys-apps/sreadahead/files/sreadahead_iter_ctrl.patch19
-rw-r--r--sys-apps/sreadahead/metadata.xml8
-rw-r--r--sys-apps/sreadahead/sreadahead-1.0-r1.ebuild39
7 files changed, 0 insertions, 369 deletions
diff --git a/sys-apps/sreadahead/ChangeLog b/sys-apps/sreadahead/ChangeLog
deleted file mode 100644
index f09cfc2cd247..000000000000
--- a/sys-apps/sreadahead/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-# ChangeLog for sys-apps/sreadahead
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sreadahead/ChangeLog,v 1.3 2009/03/28 03:13:02 darkside Exp $
-
-*sreadahead-1.0-r1 (28 Mar 2009)
-
- 28 Mar 2009; Jeremy Olexa <darkside@gentoo.org> files/sreadahead.rc,
- -files/sreadahead-pack.rc, -sreadahead-0.04.ebuild,
- -sreadahead-1.0.ebuild, +sreadahead-1.0-r1.ebuild:
- Fix init script, create a dir that is needed for runtime. follow-up on bug
- 257207
-
-*sreadahead-1.0 (27 Mar 2009)
-
- 27 Mar 2009; Jeremy Olexa <darkside@gentoo.org>
- +files/0001-kernel-trace-open.patch, +files/sreadahead_iter_ctrl.patch,
- +sreadahead-1.0.ebuild:
- Version bump, with patch from upstream - experimental and may not work yet.
- bug 257207
-
-*sreadahead-0.04 (23 Jan 2009)
-
- 23 Jan 2009; Jeremy Olexa <darkside@gentoo.org> +files/sreadahead.rc,
- +files/sreadahead-pack.rc, +metadata.xml, +sreadahead-0.04.ebuild:
- Initial commit, ebuild by Anna Gabutero, bug 255724
-
diff --git a/sys-apps/sreadahead/Manifest b/sys-apps/sreadahead/Manifest
deleted file mode 100644
index f8d82c77b4c2..000000000000
--- a/sys-apps/sreadahead/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0001-kernel-trace-open.patch 5646 RMD160 1b14b2d6e6b2d53ba2419583e6fd923fc3c9e165 SHA1 b2e5f7c7b8c50d921c4e5e51e1b886fd0577f58b SHA256 3ef0fabfbfdedd0a3ca969f0cd352dfdf4d4ae8ccc1bf98a793bd595f804f749
-AUX sreadahead.rc 462 RMD160 6e0e8f6340f1b5f22042d41a19721213eb5681e0 SHA1 94fac918748a8cad443413af2eb03fa88bc18cb3 SHA256 2084ec58a5deb78454890f12c8f12ab6bebb5db4b079b067d100617144cc90bd
-AUX sreadahead_iter_ctrl.patch 503 RMD160 002ee020ee6c285e47569507d438f5b59e04a615 SHA1 a5ea7904c9c373ace23142e6b4498d3892bf3c05 SHA256 48bbfd7c23c9fccdab0cdc21e3b19b021fe9603e131c57fb74da144be53d7e95
-DIST sreadahead-1.0.tar.gz 15630 RMD160 2b40ad80088a7d519b4c07e0f1d7a38910a26b4c SHA1 f23ed1320b383df36604bdf8a2dff875f2dfb63e SHA256 7697c9a922fdf65e1cc492070e6f2aa22468d309956d881f4c1e835475af88b8
-EBUILD sreadahead-1.0-r1.ebuild 1164 RMD160 dfffc24f35bea3b70cac1d887f8a389d96d0992b SHA1 173cf27ae59a18d1ead70ccd0b4f341a0dc7d8a8 SHA256 507ed9dd81798d12114c472056204845e8d8a7c82f74c255edd03ff72ee65f89
-MISC ChangeLog 1013 RMD160 53342644cae6bfed1fc153a82e92deb952ecea23 SHA1 38c3a665e1b6f02ab5cd19c7a5d8591818109c75 SHA256 0a39d1658cb121613f22dc3c89e8e3d486c6a6afc01f4fad42ff3d839331c330
-MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
diff --git a/sys-apps/sreadahead/files/0001-kernel-trace-open.patch b/sys-apps/sreadahead/files/0001-kernel-trace-open.patch
deleted file mode 100644
index fcb7ae480e16..000000000000
--- a/sys-apps/sreadahead/files/0001-kernel-trace-open.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-commit e9c4f51ad2b76ddbf90863c44085574197247ba3
-Author: Auke Kok <auke-jan.h.kok@intel.com>
-Date: Tue Jan 27 11:26:00 2009 -0800
-
- trace: tracer for sys_open() - sreadahead
-
- This tracer monitors regular file open() syscalls. This is a fast
- and low-overhead alternative to strace, and does not allow or
- require to be attached to every process.
-
- Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
-
-diff --git a/fs/open.c b/fs/open.c
-index a3a78ce..bd9eb9d 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -30,6 +30,10 @@
- #include <linux/audit.h>
- #include <linux/falloc.h>
-
-+#include <trace/fs.h>
-+
-+DEFINE_TRACE(do_sys_open);
-+
- int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
- {
- int retval = -ENODEV;
-@@ -1039,6 +1043,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
- } else {
- fsnotify_open(f->f_path.dentry);
- fd_install(fd, f);
-+ trace_do_sys_open(f, flags, mode, fd);
- }
- }
- putname(tmp);
-diff --git a/include/trace/fs.h b/include/trace/fs.h
-new file mode 100644
-index 0000000..870eec2
---- /dev/null
-+++ b/include/trace/fs.h
-@@ -0,0 +1,11 @@
-+#ifndef _TRACE_FS_H
-+#define _TRACE_FS_H
-+
-+#include <linux/fs.h>
-+#include <linux/tracepoint.h>
-+
-+DECLARE_TRACE(do_sys_open,
-+ TPPROTO(struct file *filp, int flags, int mode, long fd),
-+ TPARGS(filp, flags, mode, fd));
-+
-+#endif
-diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
-index e2a4ff6..d2a1ec1 100644
---- a/kernel/trace/Kconfig
-+++ b/kernel/trace/Kconfig
-@@ -149,6 +149,15 @@ config CONTEXT_SWITCH_TRACER
- This tracer gets called from the context switch and records
- all switching of tasks.
-
-+config OPEN_TRACER
-+ bool "Trace open() calls"
-+ depends on DEBUG_KERNEL
-+ select TRACING
-+ select MARKERS
-+ help
-+ This tracer records open() syscalls. These calls are made when
-+ files are accessed on disk.
-+
- config BOOT_TRACER
- bool "Trace boot initcalls"
- depends on DEBUG_KERNEL
-diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
-index 349d5a9..7f2a366 100644
---- a/kernel/trace/Makefile
-+++ b/kernel/trace/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_RING_BUFFER) += ring_buffer.o
-
- obj-$(CONFIG_TRACING) += trace.o
- obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o
-+obj-$(CONFIG_OPEN_TRACER) += trace_open.o
- obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o
- obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o
- obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
-diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 4d3d381..24c17d2 100644
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -30,6 +30,7 @@ enum trace_type {
- TRACE_USER_STACK,
- TRACE_HW_BRANCHES,
- TRACE_POWER,
-+ TRACE_OPEN,
-
- __TRACE_LAST_TYPE
- };
-diff --git a/kernel/trace/trace_open.c b/kernel/trace/trace_open.c
-new file mode 100644
-index 0000000..7153dfc
---- /dev/null
-+++ b/kernel/trace/trace_open.c
-@@ -0,0 +1,149 @@
-+/*
-+ * trace open calls
-+ * Copyright (C) 2009 Intel Corporation
-+ *
-+ * Based extensively on trace_sched_switch.c
-+ * Copyright (C) 2007 Steven Rostedt <srostedt@redhat.com>
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/fs.h>
-+#include <linux/debugfs.h>
-+#include <linux/kallsyms.h>
-+#include <linux/uaccess.h>
-+#include <linux/ftrace.h>
-+#include <trace/fs.h>
-+
-+#include "trace.h"
-+
-+
-+static struct trace_array *ctx_trace;
-+static int __read_mostly open_trace_enabled;
-+static atomic_t open_ref;
-+
-+static void probe_do_sys_open(struct file *filp, int flags, int mode, long fd)
-+{
-+ char *buf;
-+ char *fname;
-+
-+ if (!atomic_read(&open_ref))
-+ return;
-+
-+ if (!open_trace_enabled)
-+ return;
-+
-+ buf = kzalloc(PAGE_SIZE, GFP_KERNEL);
-+ if (!buf)
-+ return;
-+
-+ fname = d_path(&filp->f_path, buf, PAGE_SIZE);
-+ if (IS_ERR(fname))
-+ goto out;
-+
-+ ftrace_printk("%s: open(\"%s\", %d, %d) = %ld\n",
-+ current->comm, fname, flags, mode, fd);
-+
-+out:
-+ kfree(buf);
-+}
-+
-+static void open_trace_reset(struct trace_array *tr)
-+{
-+ tr->time_start = ftrace_now(tr->cpu);
-+ tracing_reset_online_cpus(tr);
-+}
-+
-+static int open_trace_register(void)
-+{
-+ int ret;
-+
-+ ret = register_trace_do_sys_open(probe_do_sys_open);
-+ if (ret) {
-+ pr_info("open trace: Could not activate tracepoint"
-+ " probe to do_open\n");
-+ }
-+
-+ return ret;
-+}
-+
-+static void open_trace_unregister(void)
-+{
-+ unregister_trace_do_sys_open(probe_do_sys_open);
-+}
-+
-+static void open_trace_start(void)
-+{
-+ long ref;
-+
-+ ref = atomic_inc_return(&open_ref);
-+ if (ref == 1)
-+ open_trace_register();
-+}
-+
-+static void open_trace_stop(void)
-+{
-+ long ref;
-+
-+ ref = atomic_dec_and_test(&open_ref);
-+ if (ref)
-+ open_trace_unregister();
-+}
-+
-+void open_trace_start_cmdline_record(void)
-+{
-+ open_trace_start();
-+}
-+
-+void open_trace_stop_cmdline_record(void)
-+{
-+ open_trace_stop();
-+}
-+
-+static void open_start_trace(struct trace_array *tr)
-+{
-+ open_trace_reset(tr);
-+ open_trace_start_cmdline_record();
-+ open_trace_enabled = 1;
-+}
-+
-+static void open_stop_trace(struct trace_array *tr)
-+{
-+ open_trace_enabled = 0;
-+ open_trace_stop_cmdline_record();
-+}
-+
-+static int open_trace_init(struct trace_array *tr)
-+{
-+ ctx_trace = tr;
-+
-+ open_start_trace(tr);
-+ return 0;
-+}
-+
-+static void reset_open_trace(struct trace_array *tr)
-+{
-+ open_stop_trace(tr);
-+}
-+
-+static struct tracer open_trace __read_mostly =
-+{
-+ .name = "open",
-+ .init = open_trace_init,
-+ .reset = reset_open_trace,
-+};
-+
-+__init static int init_open_trace(void)
-+{
-+ int ret = 0;
-+
-+ if (atomic_read(&open_ref))
-+ ret = open_trace_register();
-+ if (ret) {
-+ pr_info("error registering open trace\n");
-+ return ret;
-+ }
-+ return register_tracer(&open_trace);
-+}
-+device_initcall(init_open_trace);
-+
diff --git a/sys-apps/sreadahead/files/sreadahead.rc b/sys-apps/sreadahead/files/sreadahead.rc
deleted file mode 100644
index b2d39bd7b37c..000000000000
--- a/sys-apps/sreadahead/files/sreadahead.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sreadahead/files/sreadahead.rc,v 1.2 2009/03/28 03:13:02 darkside Exp $
-
-description="Start sreadahead daemon"
-
-depend() {
- need localmount
- before clock bootmisc consolefont keymaps rmnologin serial urandom
-}
-
-start() {
- ebegin "Starting sreadahead"
- /sbin/sreadahead
- eend $?
-}
-
-# vim: ts=4 sw=4
diff --git a/sys-apps/sreadahead/files/sreadahead_iter_ctrl.patch b/sys-apps/sreadahead/files/sreadahead_iter_ctrl.patch
deleted file mode 100644
index 3ab2f39ea7c1..000000000000
--- a/sys-apps/sreadahead/files/sreadahead_iter_ctrl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- sreadahead.c.orig 2009-01-28 17:26:48.000000000 +1000
-+++ sreadahead.c 2009-02-01 16:36:32.000000000 +1000
-@@ -419,6 +419,16 @@
- exit(EXIT_FAILURE);
- }
-
-+ /* Set to print out info - AW - 20090201 */
-+ file = fopen("tracing/iter_ctrl", "w");
-+ if (!file) {
-+ perror("Unable to set iter_ctrl\n");
-+ /* non-fatal */
-+ } else {
-+ fprintf(file, "ftrace_printk");
-+ fclose(file);
-+ }
-+
- file = fopen("tracing/tracing_enabled", "w");
- if (!file) {
- perror("Unable to enable tracing\n");
diff --git a/sys-apps/sreadahead/metadata.xml b/sys-apps/sreadahead/metadata.xml
deleted file mode 100644
index a58bf8266ebc..000000000000
--- a/sys-apps/sreadahead/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
- <email>darkside@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/sreadahead/sreadahead-1.0-r1.ebuild b/sys-apps/sreadahead/sreadahead-1.0-r1.ebuild
deleted file mode 100644
index 5a702e5ee7f3..000000000000
--- a/sys-apps/sreadahead/sreadahead-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sreadahead/sreadahead-1.0-r1.ebuild,v 1.1 2009/03/28 03:13:02 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="A readahead implementation optimized for solid state disks"
-HOMEPAGE="http://code.google.com/p/sreadahead/"
-SRC_URI="http://sreadahead.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/sreadahead_iter_ctrl.patch"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README "${FILESDIR}/0001-kernel-trace-open.patch" || die
- newinitd "${FILESDIR}"/sreadahead.rc sreadahead || die
- keepdir "/var/lib/sreadahead/debugfs" || die "dodir failed"
-}
-
-pkg_postinst() {
- elog "Sreadahead requires a kernel built with the trace-open patch,"
- elog "which can be found in /usr/share/doc/${PF}"
- elog "If you don't know how to do this, it may be best to stay away from it"
- elog
- elog "To add sreadahead to your runlevels:"
- elog " # rc-update add sreadahead boot"
-}