diffstat:
fs/buffer.c | 3 +++
fs/exec.c | 6 ++++++
fs/ioctl.c | 7 +++++++
fs/open.c | 10 ++++++++++
fs/read_write.c | 35 +++++++++++++++++++++++++++++++++++
fs/select.c | 10 ++++++++++
ipc/msg.c | 3 +++
ipc/sem.c | 2 ++
ipc/shm.c | 2 ++
kernel/Makefile | 3 ++-
kernel/exit.c | 6 ++++++
kernel/fork.c | 3 +++
kernel/itimer.c | 5 +++++
kernel/sched.c | 8 +++++++-
kernel/signal.c | 3 +++
kernel/softirq.c | 11 ++++++++++-
kernel/timer.c | 3 +++
mm/filemap.c | 3 +++
mm/memory.c | 4 ++++
mm/page_alloc.c | 4 ++++
mm/page_io.c | 2 ++
net/core/dev.c | 6 ++++++
net/socket.c | 10 ++++++++++
23 files changed, 146 insertions(+), 3 deletions(-)
diff -urpN linux-2.5.44-bk2/fs/buffer.c linux-2.5.44-bk2-ltt/fs/buffer.c
--- linux-2.5.44-bk2/fs/buffer.c Sat Oct 19 00:01:57 2002
+++ linux-2.5.44-bk2-ltt/fs/buffer.c Tue Oct 29 15:24:18 2002
@@ -36,6 +36,7 @@
#include <linux/suspend.h>
#include <linux/buffer_head.h>
#include <linux/bio.h>
+#include <linux/trace.h>
#include <asm/bitops.h>
static void invalidate_bh_lrus(void);
@@ -133,11 +134,13 @@ void __wait_on_buffer(struct buffer_head
get_bh(bh);
do {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_BUF_WAIT_START, 0, 0, NULL);
prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
blk_run_queues();
if (buffer_locked(bh))
schedule();
} while (buffer_locked(bh));
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_BUF_WAIT_END, 0, 0, NULL);
put_bh(bh);
finish_wait(wqh, &wait);
}
diff -urpN linux-2.5.44-bk2/fs/exec.c linux-2.5.44-bk2-ltt/fs/exec.c
--- linux-2.5.44-bk2/fs/exec.c Sat Oct 19 00:01:48 2002
+++ linux-2.5.44-bk2-ltt/fs/exec.c Tue Oct 29 15:24:18 2002
@@ -43,6 +43,7 @@
#include <linux/namei.h>
#include <linux/proc_fs.h>
#include <linux/ptrace.h>
+#include <linux/trace.h>
#include <asm/uaccess.h>
#include <asm/pgalloc.h>
@@ -1007,6 +1008,11 @@ int do_execve(char * filename, char ** a
if (IS_ERR(file))
return retval;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_EXEC,
+ 0,
+ file->f_dentry->d_name.len,
+ file->f_dentry->d_name.name);
+
bprm.p = PAGE_SIZE*MAX_ARG_PAGES-sizeof(void *);
memset(bprm.page, 0, MAX_ARG_PAGES*sizeof(bprm.page[0]));
diff -urpN linux-2.5.44-bk2/fs/ioctl.c linux-2.5.44-bk2-ltt/fs/ioctl.c
--- linux-2.5.44-bk2/fs/ioctl.c Sat Oct 19 00:01:17 2002
+++ linux-2.5.44-bk2-ltt/fs/ioctl.c Tue Oct 29 15:24:18 2002
@@ -10,6 +10,8 @@
#include <linux/fs.h>
#include <linux/security.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
#include <asm/ioctls.h>
@@ -65,6 +67,11 @@ asmlinkage long sys_ioctl(unsigned int f
goto out;
}
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_IOCTL,
+ fd,
+ cmd,
+ NULL);
+
lock_kernel();
switch (cmd) {
case FIOCLEX:
diff -urpN linux-2.5.44-bk2/fs/open.c linux-2.5.44-bk2-ltt/fs/open.c
--- linux-2.5.44-bk2/fs/open.c Tue Oct 29 15:55:14 2002
+++ linux-2.5.44-bk2-ltt/fs/open.c Tue Oct 29 15:24:18 2002
@@ -18,6 +18,8 @@
#include <linux/backing-dev.h>
#include <linux/security.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
#define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
@@ -800,6 +802,10 @@ asmlinkage long sys_open(const char * fi
error = PTR_ERR(f);
if (IS_ERR(f))
goto out_error;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_OPEN,
+ fd,
+ f->f_dentry->d_name.len,
+ f->f_dentry->d_name.name);
fd_install(fd, f);
}
out:
@@ -866,6 +872,10 @@ asmlinkage long sys_close(unsigned int f
filp = files->fd[fd];
if (!filp)
goto out_unlock;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_CLOSE,
+ fd,
+ 0,
+ NULL);
files->fd[fd] = NULL;
FD_CLR(fd, files->close_on_exec);
__put_unused_fd(files, fd);
diff -urpN linux-2.5.44-bk2/fs/read_write.c linux-2.5.44-bk2-ltt/fs/read_write.c
--- linux-2.5.44-bk2/fs/read_write.c Sat Oct 19 00:02:00 2002
+++ linux-2.5.44-bk2-ltt/fs/read_write.c Tue Oct 29 15:24:18 2002
@@ -14,6 +14,8 @@
#include <linux/security.h>
#include <linux/module.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
struct file_operations generic_ro_fops = {
@@ -128,6 +130,10 @@ asmlinkage off_t sys_lseek(unsigned int
if (res != (loff_t)retval)
retval = -EOVERFLOW; /* LFS: should only happen on 32 bit platforms */
}
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_SEEK,
+ fd,
+ offset,
+ NULL);
fput(file);
bad:
return retval;
@@ -154,6 +160,11 @@ asmlinkage long sys_llseek(unsigned int
offset = llseek(file, ((loff_t) offset_high << 32) | offset_low,
origin);
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_SEEK,
+ fd,
+ offset,
+ NULL);
+
retval = (int)offset;
if (offset >= 0) {
retval = -EFAULT;
@@ -254,6 +265,10 @@ asmlinkage ssize_t sys_read(unsigned int
file = fget(fd);
if (file) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_READ,
+ fd,
+ count,
+ NULL);
ret = vfs_read(file, buf, count, &file->f_pos);
fput(file);
}
@@ -268,6 +283,10 @@ asmlinkage ssize_t sys_write(unsigned in
file = fget(fd);
if (file) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_WRITE,
+ fd,
+ count,
+ NULL);
ret = vfs_write(file, buf, count, &file->f_pos);
fput(file);
}
@@ -286,6 +305,10 @@ asmlinkage ssize_t sys_pread64(unsigned
file = fget(fd);
if (file) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_READ,
+ fd,
+ count,
+ NULL);
ret = vfs_read(file, buf, count, &pos);
fput(file);
}
@@ -304,6 +327,10 @@ asmlinkage ssize_t sys_pwrite64(unsigned
file = fget(fd);
if (file) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_WRITE,
+ fd,
+ count,
+ NULL);
ret = vfs_write(file, buf, count, &pos);
fput(file);
}
@@ -463,6 +490,10 @@ sys_readv(unsigned long fd, const struct
file = fget(fd);
if (!file)
goto bad_file;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_READ,
+ fd,
+ nr_segs,
+ NULL);
if (file->f_op && (file->f_mode & FMODE_READ) &&
(file->f_op->readv || file->f_op->read)) {
ret = security_ops->file_permission (file, MAY_READ);
@@ -486,6 +517,10 @@ sys_writev(unsigned long fd, const struc
file = fget(fd);
if (!file)
goto bad_file;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_WRITE,
+ fd,
+ nr_segs,
+ NULL);
if (file->f_op && (file->f_mode & FMODE_WRITE) &&
(file->f_op->writev || file->f_op->write)) {
ret = security_ops->file_permission (file, MAY_WRITE);
diff -urpN linux-2.5.44-bk2/fs/select.c linux-2.5.44-bk2-ltt/fs/select.c
--- linux-2.5.44-bk2/fs/select.c Sat Oct 19 00:01:08 2002
+++ linux-2.5.44-bk2-ltt/fs/select.c Tue Oct 29 15:24:18 2002
@@ -21,6 +21,8 @@
#include <linux/file.h>
#include <linux/fs.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
#define ROUND_UP(x,y) (((x)+(y)-1)/(y))
@@ -194,6 +196,10 @@ int do_select(int n, fd_set_bits *fds, l
file = fget(i);
mask = POLLNVAL;
if (file) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_SELECT,
+ i /* The fd*/,
+ __timeout,
+ NULL);
mask = DEFAULT_POLLMASK;
if (file->f_op && file->f_op->poll)
mask = file->f_op->poll(file, wait);
@@ -368,6 +374,10 @@ static void do_pollfd(unsigned int num,
struct file * file = fget(fd);
mask = POLLNVAL;
if (file != NULL) {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_POLL,
+ fd,
+ 0,
+ NULL);
mask = DEFAULT_POLLMASK;
if (file->f_op && file->f_op->poll)
mask = file->f_op->poll(file, *pwait);
diff -urpN linux-2.5.44-bk2/ipc/msg.c linux-2.5.44-bk2-ltt/ipc/msg.c
--- linux-2.5.44-bk2/ipc/msg.c Sat Oct 19 00:00:43 2002
+++ linux-2.5.44-bk2-ltt/ipc/msg.c Tue Oct 29 15:24:18 2002
@@ -26,6 +26,8 @@
#include <asm/uaccess.h>
#include "util.h"
+#include <linux/trace.h>
+
/* sysctl: */
int msg_ctlmax = MSGMAX;
int msg_ctlmnb = MSGMNB;
@@ -311,6 +313,7 @@ asmlinkage long sys_msgget (key_t key, i
msg_unlock(id);
}
up(&msg_ids.sem);
+ TRACE_IPC(TRACE_EV_IPC_MSG_CREATE, ret, msgflg);
return ret;
}
diff -urpN linux-2.5.44-bk2/ipc/sem.c linux-2.5.44-bk2-ltt/ipc/sem.c
--- linux-2.5.44-bk2/ipc/sem.c Sat Oct 19 00:01:48 2002
+++ linux-2.5.44-bk2-ltt/ipc/sem.c Tue Oct 29 15:24:18 2002
@@ -67,6 +67,7 @@
#include <asm/uaccess.h>
#include "util.h"
+#include <linux/trace.h>
#define sem_lock(id) ((struct sem_array*)ipc_lock(&sem_ids,id))
#define sem_unlock(id) ipc_unlock(&sem_ids,id)
@@ -193,6 +194,7 @@ asmlinkage long sys_semget (key_t key, i
}
up(&sem_ids.sem);
+ TRACE_IPC(TRACE_EV_IPC_SEM_CREATE, err, semflg);
return err;
}
diff -urpN linux-2.5.44-bk2/ipc/shm.c linux-2.5.44-bk2-ltt/ipc/shm.c
--- linux-2.5.44-bk2/ipc/shm.c Sat Oct 19 00:01:54 2002
+++ linux-2.5.44-bk2-ltt/ipc/shm.c Tue Oct 29 15:24:18 2002
@@ -25,6 +25,7 @@
#include <linux/proc_fs.h>
#include <linux/shmem_fs.h>
#include <linux/security.h>
+#include <linux/trace.h>
#include <asm/uaccess.h>
#include "util.h"
@@ -255,6 +256,7 @@ asmlinkage long sys_shmget (key_t key, s
shm_unlock(id);
}
up(&shm_ids.sem);
+ TRACE_IPC(TRACE_EV_IPC_SHM_CREATE, err, shmflg);
return err;
}
diff -urpN linux-2.5.44-bk2/kernel/Makefile linux-2.5.44-bk2-ltt/kernel/Makefile
--- linux-2.5.44-bk2/kernel/Makefile Sat Oct 19 00:01:17 2002
+++ linux-2.5.44-bk2-ltt/kernel/Makefile Tue Oct 29 15:24:19 2002
@@ -4,7 +4,7 @@
export-objs = signal.o sys.o kmod.o workqueue.o ksyms.o pm.o exec_domain.o \
printk.o platform.o suspend.o dma.o module.o cpufreq.o \
- profile.o rcupdate.o
+ profile.o rcupdate.o trace.o
obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
module.o exit.o itimer.o time.o softirq.o resource.o \
@@ -21,6 +21,7 @@ obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
+obj-$(CONFIG_TRACE) += trace.o
ifneq ($(CONFIG_IA64),y)
# According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
diff -urpN linux-2.5.44-bk2/kernel/exit.c linux-2.5.44-bk2-ltt/kernel/exit.c
--- linux-2.5.44-bk2/kernel/exit.c Sat Oct 19 00:02:29 2002
+++ linux-2.5.44-bk2-ltt/kernel/exit.c Tue Oct 29 15:24:19 2002
@@ -21,6 +21,8 @@
#include <linux/ptrace.h>
#include <linux/profile.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
@@ -643,6 +645,8 @@ fake_volatile:
acct_process(code);
__exit_mm(tsk);
+ TRACE_PROCESS_EXIT(0, 0);
+
sem_exit();
__exit_files(tsk);
__exit_fs(tsk);
@@ -790,6 +794,8 @@ asmlinkage long sys_wait4(pid_t pid,unsi
if (options & ~(WNOHANG|WUNTRACED|__WNOTHREAD|__WCLONE|__WALL))
return -EINVAL;
+ TRACE_PROCESS(TRACE_EV_PROCESS_WAIT, pid, 0);
+
add_wait_queue(¤t->wait_chldexit,&wait);
repeat:
flag = 0;
diff -urpN linux-2.5.44-bk2/kernel/fork.c linux-2.5.44-bk2-ltt/kernel/fork.c
--- linux-2.5.44-bk2/kernel/fork.c Tue Oct 29 15:55:16 2002
+++ linux-2.5.44-bk2-ltt/kernel/fork.c Tue Oct 29 15:24:19 2002
@@ -28,6 +28,7 @@
#include <linux/security.h>
#include <linux/futex.h>
#include <linux/ptrace.h>
+#include <linux/trace.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
@@ -971,6 +972,8 @@ struct task_struct *do_fork(unsigned lon
if (p->ptrace & PT_PTRACED)
send_sig(SIGSTOP, p, 1);
+ TRACE_PROCESS(TRACE_EV_PROCESS_FORK, p->pid, 0);
+
wake_up_forked_process(p); /* do this last */
++total_forks;
if (clone_flags & CLONE_VFORK)
diff -urpN linux-2.5.44-bk2/kernel/itimer.c linux-2.5.44-bk2-ltt/kernel/itimer.c
--- linux-2.5.44-bk2/kernel/itimer.c Sat Oct 19 00:01:52 2002
+++ linux-2.5.44-bk2-ltt/kernel/itimer.c Tue Oct 29 15:24:19 2002
@@ -10,6 +10,8 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
+#include <linux/trace.h>
+
#include <asm/uaccess.h>
int do_getitimer(int which, struct itimerval *value)
@@ -67,6 +69,8 @@ void it_real_fn(unsigned long __data)
struct task_struct * p = (struct task_struct *) __data;
unsigned long interval;
+ TRACE_TIMER(TRACE_EV_TIMER_EXPIRED, 0, 0, 0);
+
send_sig(SIGALRM, p, 1);
interval = p->it_real_incr;
if (interval) {
@@ -86,6 +90,7 @@ int do_setitimer(int which, struct itime
j = timeval_to_jiffies(&value->it_value);
if (ovalue && (k = do_getitimer(which, ovalue)) < 0)
return k;
+ TRACE_TIMER(TRACE_EV_TIMER_SETITIMER, which, i, j);
switch (which) {
case ITIMER_REAL:
del_timer_sync(¤t->real_timer);
diff -urpN linux-2.5.44-bk2/kernel/sched.c linux-2.5.44-bk2-ltt/kernel/sched.c
--- linux-2.5.44-bk2/kernel/sched.c Sat Oct 19 00:02:28 2002
+++ linux-2.5.44-bk2-ltt/kernel/sched.c Tue Oct 29 15:24:19 2002
@@ -32,6 +32,7 @@
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/rcupdate.h>
+#include <linux/trace.h>
/*
* Convert user-nice values [ -20 ... 0 ... 19 ]
@@ -407,6 +408,8 @@ static int try_to_wake_up(task_t * p, in
long old_state;
runqueue_t *rq;
+ TRACE_PROCESS(TRACE_EV_PROCESS_WAKEUP, p->pid, p->state);
+
repeat_lock_task:
rq = task_rq_lock(p, &flags);
old_state = p->state;
@@ -1032,8 +1035,11 @@ switch_tasks:
if (likely(prev != next)) {
rq->nr_switches++;
rq->curr = next;
-
+
prepare_arch_switch(rq, next);
+
+ TRACE_SCHEDCHANGE(prev, next);
+
prev = context_switch(prev, next);
barrier();
rq = this_rq();
diff -urpN linux-2.5.44-bk2/kernel/signal.c linux-2.5.44-bk2-ltt/kernel/signal.c
--- linux-2.5.44-bk2/kernel/signal.c Sat Oct 19 00:01:49 2002
+++ linux-2.5.44-bk2-ltt/kernel/signal.c Tue Oct 29 15:24:19 2002
@@ -18,6 +18,7 @@
#include <linux/fs.h>
#include <linux/tty.h>
#include <linux/binfmts.h>
+#include <linux/trace.h>
#include <asm/param.h>
#include <asm/uaccess.h>
#include <asm/siginfo.h>
@@ -725,6 +726,8 @@ specific_send_sig_info(int sig, struct s
if (ignored_signal(sig, t))
goto out;
+ TRACE_PROCESS(TRACE_EV_PROCESS_SIGNAL, sig, t->pid);
+
#define LEGACY_QUEUE(sigptr, sig) \
(((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig)))
diff -urpN linux-2.5.44-bk2/kernel/softirq.c linux-2.5.44-bk2-ltt/kernel/softirq.c
--- linux-2.5.44-bk2/kernel/softirq.c Sat Oct 19 00:01:18 2002
+++ linux-2.5.44-bk2-ltt/kernel/softirq.c Tue Oct 29 15:24:19 2002
@@ -12,6 +12,7 @@
#include <linux/percpu.h>
#include <linux/init.h>
#include <linux/mm.h>
+#include <linux/trace.h>
/*
- No shared variables, all the data are CPU local.
@@ -78,8 +79,10 @@ restart:
h = softirq_vec;
do {
- if (pending & 1)
+ if (pending & 1) {
+ TRACE_SOFT_IRQ(TRACE_EV_SOFT_IRQ_SOFT_IRQ, (h - softirq_vec));
h->action(h);
+ }
h++;
pending >>= 1;
} while (pending);
@@ -187,6 +190,9 @@ static void tasklet_action(struct softir
if (!atomic_read(&t->count)) {
if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
BUG();
+
+ TRACE_SOFT_IRQ(TRACE_EV_SOFT_IRQ_TASKLET_ACTION, (unsigned long) (t->func));
+
t->func(t->data);
tasklet_unlock(t);
continue;
@@ -220,6 +226,9 @@ static void tasklet_hi_action(struct sof
if (!atomic_read(&t->count)) {
if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
BUG();
+
+ TRACE_SOFT_IRQ(TRACE_EV_SOFT_IRQ_TASKLET_HI_ACTION, (unsigned long) (t->func));
+
t->func(t->data);
tasklet_unlock(t);
continue;
diff -urpN linux-2.5.44-bk2/kernel/timer.c linux-2.5.44-bk2-ltt/kernel/timer.c
--- linux-2.5.44-bk2/kernel/timer.c Sat Oct 19 00:01:19 2002
+++ linux-2.5.44-bk2-ltt/kernel/timer.c Tue Oct 29 15:24:19 2002
@@ -24,6 +24,7 @@
#include <linux/percpu.h>
#include <linux/init.h>
#include <linux/mm.h>
+#include <linux/trace.h>
#include <asm/uaccess.h>
@@ -713,6 +714,7 @@ static void run_timer_tasklet(unsigned l
{
tvec_base_t *base = tvec_bases + smp_processor_id();
+ TRACE_EVENT(TRACE_EV_KERNEL_TIMER, NULL);
if ((long)(jiffies - base->timer_jiffies) >= 0)
__run_timers(base);
}
@@ -881,6 +883,7 @@ asmlinkage long sys_getegid(void)
static void process_timeout(unsigned long __data)
{
+ TRACE_TIMER(TRACE_EV_TIMER_EXPIRED, 0, 0, 0);
wake_up_process((task_t *)__data);
}
diff -urpN linux-2.5.44-bk2/mm/filemap.c linux-2.5.44-bk2-ltt/mm/filemap.c
--- linux-2.5.44-bk2/mm/filemap.c Tue Oct 29 15:55:16 2002
+++ linux-2.5.44-bk2-ltt/mm/filemap.c Tue Oct 29 15:24:19 2002
@@ -25,6 +25,7 @@
#include <linux/pagevec.h>
#include <linux/blkdev.h>
#include <linux/security.h>
+#include <linux/trace.h>
/*
* This is needed for the following functions:
* - try_to_release_page
@@ -301,11 +302,13 @@ void wait_on_page_bit(struct page *page,
DEFINE_WAIT(wait);
do {
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_WAIT_START, 0);
prepare_to_wait(waitqueue, &wait, TASK_UNINTERRUPTIBLE);
sync_page(page);
if (test_bit(bit_nr, &page->flags))
io_schedule();
} while (test_bit(bit_nr, &page->flags));
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_WAIT_END, 0);
finish_wait(waitqueue, &wait);
}
EXPORT_SYMBOL(wait_on_page_bit);
diff -urpN linux-2.5.44-bk2/mm/memory.c linux-2.5.44-bk2-ltt/mm/memory.c
--- linux-2.5.44-bk2/mm/memory.c Sat Oct 19 00:01:52 2002
+++ linux-2.5.44-bk2-ltt/mm/memory.c Tue Oct 29 15:24:19 2002
@@ -44,6 +44,9 @@
#include <linux/pagemap.h>
#include <linux/vcache.h>
+#include <linux/module.h>
+#include <linux/trace.h>
+
#include <asm/pgalloc.h>
#include <asm/rmap.h>
#include <asm/uaccess.h>
@@ -980,6 +983,7 @@ static int do_swap_page(struct mm_struct
spin_unlock(&mm->page_table_lock);
page = lookup_swap_cache(entry);
if (!page) {
+ TRACE_MEMORY(TRACE_EV_MEMORY_SWAP_IN, address);
swapin_readahead(entry);
page = read_swap_cache_async(entry);
if (!page) {
diff -urpN linux-2.5.44-bk2/mm/page_alloc.c linux-2.5.44-bk2-ltt/mm/page_alloc.c
--- linux-2.5.44-bk2/mm/page_alloc.c Tue Oct 29 15:55:17 2002
+++ linux-2.5.44-bk2-ltt/mm/page_alloc.c Tue Oct 29 15:24:19 2002
@@ -25,6 +25,7 @@
#include <linux/pagevec.h>
#include <linux/blkdev.h>
#include <linux/slab.h>
+#include <linux/trace.h>
struct pglist_data *pgdat_list;
unsigned long totalram_pages;
@@ -113,6 +114,8 @@ void __free_pages_ok (struct page *page,
if (PageDirty(page))
ClearPageDirty(page);
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_FREE, order);
+
if (unlikely(current->flags & PF_FREE_PAGES)) {
if (!current->nr_local_pages && !in_interrupt()) {
list_add(&page->list, ¤t->local_pages);
@@ -449,6 +452,7 @@ unsigned long __get_free_pages(unsigned
page = alloc_pages(gfp_mask, order);
if (!page)
return 0;
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_ALLOC, order);
return (unsigned long) page_address(page);
}
diff -urpN linux-2.5.44-bk2/mm/page_io.c linux-2.5.44-bk2-ltt/mm/page_io.c
--- linux-2.5.44-bk2/mm/page_io.c Sat Oct 19 00:01:12 2002
+++ linux-2.5.44-bk2-ltt/mm/page_io.c Tue Oct 29 15:24:19 2002
@@ -18,6 +18,7 @@
#include <linux/swapops.h>
#include <linux/buffer_head.h> /* for block_sync_page() */
#include <linux/mpage.h>
+#include <linux/trace.h>
#include <asm/pgtable.h>
static struct bio *
@@ -103,6 +104,7 @@ int swap_writepage(struct page *page)
inc_page_state(pswpout);
SetPageWriteback(page);
unlock_page(page);
+ TRACE_MEMORY(TRACE_EV_MEMORY_SWAP_OUT, (unsigned long) page);
submit_bio(WRITE, bio);
out:
return ret;
diff -urpN linux-2.5.44-bk2/net/core/dev.c linux-2.5.44-bk2-ltt/net/core/dev.c
--- linux-2.5.44-bk2/net/core/dev.c Sat Oct 19 00:01:54 2002
+++ linux-2.5.44-bk2-ltt/net/core/dev.c Tue Oct 29 15:24:19 2002
@@ -105,10 +105,12 @@
#include <linux/init.h>
#include <linux/kmod.h>
#include <linux/module.h>
+#include <linux/trace.h>
#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
#include <net/iw_handler.h>
#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
+
#ifdef CONFIG_PLIP
extern int plip_init(void);
#endif
@@ -1009,6 +1011,8 @@ int dev_queue_xmit(struct sk_buff *skb)
goto out;
}
+ TRACE_NETWORK(TRACE_EV_NETWORK_PACKET_OUT, skb->protocol);
+
/* Grab device queue */
spin_lock_bh(&dev->queue_lock);
q = dev->qdisc;
@@ -1419,6 +1423,8 @@ int netif_receive_skb(struct sk_buff *sk
netdev_rx_stat[smp_processor_id()].total++;
+ TRACE_NETWORK(TRACE_EV_NETWORK_PACKET_IN, skb->protocol);
+
#ifdef CONFIG_NET_FASTROUTE
if (skb->pkt_type == PACKET_FASTROUTE) {
netdev_rx_stat[smp_processor_id()].fastroute_deferred_out++;
diff -urpN linux-2.5.44-bk2/net/socket.c linux-2.5.44-bk2-ltt/net/socket.c
--- linux-2.5.44-bk2/net/socket.c Tue Oct 29 15:55:19 2002
+++ linux-2.5.44-bk2-ltt/net/socket.c Tue Oct 29 15:24:19 2002
@@ -77,6 +77,8 @@
#include <linux/wireless.h>
#include <linux/divert.h>
+#include <linux/trace.h>
+
#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
#include <linux/kmod.h>
#endif
@@ -538,6 +540,8 @@ int sock_sendmsg(struct socket *sock, st
struct kiocb iocb;
int ret;
+ TRACE_SOCKET(TRACE_EV_SOCKET_SEND, sock->type, size);
+
init_sync_kiocb(&iocb, NULL);
ret = __sock_sendmsg(&iocb, sock, msg, size);
if (-EIOCBQUEUED == ret)
@@ -571,6 +575,8 @@ int sock_recvmsg(struct socket *sock, st
struct kiocb iocb;
int ret;
+ TRACE_SOCKET(TRACE_EV_SOCKET_RECEIVE, sock->type, size);
+
init_sync_kiocb(&iocb, NULL);
ret = __sock_recvmsg(&iocb, sock, msg, size, flags);
if (-EIOCBQUEUED == ret)
@@ -1047,6 +1053,8 @@ asmlinkage long sys_socket(int family, i
if (retval < 0)
goto out_release;
+ TRACE_SOCKET(TRACE_EV_SOCKET_CREATE, retval, type);
+
out:
/* It may be already another descriptor 8) Not kernel problem. */
return retval;
@@ -1666,6 +1674,8 @@ asmlinkage long sys_socketcall(int call,
a0=a[0];
a1=a[1];
+
+ TRACE_SOCKET(TRACE_EV_SOCKET_CALL, call, a0);
switch(call)
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/