[PATCH] LTT for 2.5.36 3/9: Core trace statements

From: Karim Yaghmour (karim@opersys.com)
Date: Thu Sep 19 2002 - 17:33:29 EST


These are the core trace statements inserted by LTT.

Here are the file modifications:
 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/exit.c | 3 +++
 kernel/fork.c | 2 ++
 kernel/itimer.c | 5 +++++
 kernel/sched.c | 8 +++++++-
 kernel/signal.c | 3 +++
 kernel/softirq.c | 15 +++++++++++++--
 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 ++++++++++
 22 files changed, 143 insertions, 3 deletions

diff -urpN linux-2.5.36/fs/buffer.c linux-2.5.36-ltt/fs/buffer.c
--- linux-2.5.36/fs/buffer.c Tue Sep 17 20:58:59 2002
+++ linux-2.5.36-ltt/fs/buffer.c Thu Sep 19 16:29:56 2002
@@ -35,6 +35,7 @@
 #include <linux/hash.h>
 #include <linux/suspend.h>
 #include <linux/buffer_head.h>
+#include <linux/trace.h>
 #include <asm/bitops.h>
 
 static void invalidate_bh_lrus(void);
@@ -134,6 +135,7 @@ void __wait_on_buffer(struct buffer_head
         get_bh(bh);
         add_wait_queue(wq, &wait);
         do {
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_BUF_WAIT_START, 0, 0, NULL);
                 blk_run_queues();
                 set_task_state(tsk, TASK_UNINTERRUPTIBLE);
                 if (!buffer_locked(bh))
@@ -141,6 +143,7 @@ void __wait_on_buffer(struct buffer_head
                 schedule();
         } while (buffer_locked(bh));
         tsk->state = TASK_RUNNING;
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_BUF_WAIT_END, 0, 0, NULL);
         remove_wait_queue(wq, &wait);
         put_bh(bh);
 }
diff -urpN linux-2.5.36/fs/exec.c linux-2.5.36-ltt/fs/exec.c
--- linux-2.5.36/fs/exec.c Tue Sep 17 20:58:51 2002
+++ linux-2.5.36-ltt/fs/exec.c Thu Sep 19 16:33:56 2002
@@ -42,6 +42,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>
@@ -1004,6 +1005,11 @@ int do_execve(char * filename, char ** a
         retval = PTR_ERR(file);
         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.36/fs/ioctl.c linux-2.5.36-ltt/fs/ioctl.c
--- linux-2.5.36/fs/ioctl.c Tue Sep 17 20:58:48 2002
+++ linux-2.5.36-ltt/fs/ioctl.c Thu Sep 19 16:29:56 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>
 
@@ -64,6 +66,11 @@ asmlinkage long sys_ioctl(unsigned int f
                 fput(filp);
                 goto out;
         }
+
+ TRACE_FILE_SYSTEM(TRACE_EV_FILE_SYSTEM_IOCTL,
+ fd,
+ cmd,
+ NULL);
 
         lock_kernel();
         switch (cmd) {
diff -urpN linux-2.5.36/fs/open.c linux-2.5.36-ltt/fs/open.c
--- linux-2.5.36/fs/open.c Tue Sep 17 20:58:43 2002
+++ linux-2.5.36-ltt/fs/open.c Thu Sep 19 16:29:56 2002
@@ -19,6 +19,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))
@@ -801,6 +803,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:
@@ -867,6 +873,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.36/fs/read_write.c linux-2.5.36-ltt/fs/read_write.c
--- linux-2.5.36/fs/read_write.c Tue Sep 17 20:59:00 2002
+++ linux-2.5.36-ltt/fs/read_write.c Thu Sep 19 16:29:56 2002
@@ -13,6 +13,8 @@
 #include <linux/dnotify.h>
 #include <linux/security.h>
 
+#include <linux/trace.h>
+
 #include <asm/uaccess.h>
 
 struct file_operations generic_ro_fops = {
@@ -133,6 +135,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;
@@ -163,6 +169,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;
@@ -229,6 +240,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);
         }
@@ -243,6 +258,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);
         }
@@ -261,6 +280,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);
         }
@@ -279,6 +302,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);
         }
@@ -436,6 +463,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);
@@ -459,6 +490,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.36/fs/select.c linux-2.5.36-ltt/fs/select.c
--- linux-2.5.36/fs/select.c Tue Sep 17 20:58:43 2002
+++ linux-2.5.36-ltt/fs/select.c Thu Sep 19 16:29:56 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.36/ipc/msg.c linux-2.5.36-ltt/ipc/msg.c
--- linux-2.5.36/ipc/msg.c Tue Sep 17 20:58:41 2002
+++ linux-2.5.36-ltt/ipc/msg.c Thu Sep 19 16:29:57 2002
@@ -25,6 +25,8 @@
 #include <asm/uaccess.h>
 #include "util.h"
 
+#include <linux/trace.h>
+
 /* sysctl: */
 int msg_ctlmax = MSGMAX;
 int msg_ctlmnb = MSGMNB;
@@ -300,6 +302,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.36/ipc/sem.c linux-2.5.36-ltt/ipc/sem.c
--- linux-2.5.36/ipc/sem.c Tue Sep 17 20:58:51 2002
+++ linux-2.5.36-ltt/ipc/sem.c Thu Sep 19 16:29:57 2002
@@ -66,6 +66,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)
@@ -183,6 +184,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.36/ipc/shm.c linux-2.5.36-ltt/ipc/shm.c
--- linux-2.5.36/ipc/shm.c Tue Sep 17 20:58:58 2002
+++ linux-2.5.36-ltt/ipc/shm.c Thu Sep 19 16:29:57 2002
@@ -24,6 +24,7 @@
 #include <linux/mman.h>
 #include <linux/proc_fs.h>
 #include <linux/shmem_fs.h>
+#include <linux/trace.h>
 #include <asm/uaccess.h>
 
 #include "util.h"
@@ -245,6 +246,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.36/kernel/exit.c linux-2.5.36-ltt/kernel/exit.c
--- linux-2.5.36/kernel/exit.c Thu Sep 19 17:30:36 2002
+++ linux-2.5.36-ltt/kernel/exit.c Thu Sep 19 16:29:57 2002
@@ -621,6 +621,7 @@ fake_volatile:
         acct_process(code);
         __exit_mm(tsk);
 
+ TRACE_PROCESS(TRACE_EV_PROCESS_EXIT, 0, 0);
         free_trace_info(tsk);
 
         sem_exit();
@@ -749,6 +750,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(&current->wait_chldexit,&wait);
 repeat:
diff -urpN linux-2.5.36/kernel/fork.c linux-2.5.36-ltt/kernel/fork.c
--- linux-2.5.36/kernel/fork.c Thu Sep 19 17:29:53 2002
+++ linux-2.5.36-ltt/kernel/fork.c Thu Sep 19 16:29:57 2002
@@ -954,6 +954,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.36/kernel/itimer.c linux-2.5.36-ltt/kernel/itimer.c
--- linux-2.5.36/kernel/itimer.c Tue Sep 17 20:58:52 2002
+++ linux-2.5.36-ltt/kernel/itimer.c Thu Sep 19 16:29:57 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(&current->real_timer);
diff -urpN linux-2.5.36/kernel/sched.c linux-2.5.36-ltt/kernel/sched.c
--- linux-2.5.36/kernel/sched.c Tue Sep 17 20:58:48 2002
+++ linux-2.5.36-ltt/kernel/sched.c Thu Sep 19 16:29:57 2002
@@ -29,6 +29,7 @@
 #include <linux/security.h>
 #include <linux/notifier.h>
 #include <linux/delay.h>
+#include <linux/trace.h>
 
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
@@ -404,6 +405,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;
@@ -1007,8 +1010,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.36/kernel/signal.c linux-2.5.36-ltt/kernel/signal.c
--- linux-2.5.36/kernel/signal.c Tue Sep 17 20:58:52 2002
+++ linux-2.5.36-ltt/kernel/signal.c Thu Sep 19 16:29:57 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>
@@ -738,6 +739,8 @@ __send_sig_info(int sig, struct siginfo
 
         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.36/kernel/softirq.c linux-2.5.36-ltt/kernel/softirq.c
--- linux-2.5.36/kernel/softirq.c Tue Sep 17 20:58:48 2002
+++ linux-2.5.36-ltt/kernel/softirq.c Thu Sep 19 16:29:57 2002
@@ -18,6 +18,7 @@
 #include <linux/tqueue.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
+#include <linux/trace.h>
 
 /*
    - No shared variables, all the data are CPU local.
@@ -85,8 +86,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);
@@ -194,6 +197,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;
@@ -227,6 +233,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;
@@ -290,8 +299,10 @@ static void bh_action(unsigned long nr)
         if (!spin_trylock(&global_bh_lock))
                 goto resched;
 
- if (bh_base[nr])
+ if (bh_base[nr]){
+ TRACE_SOFT_IRQ(TRACE_EV_SOFT_IRQ_BOTTOM_HALF, (nr));
                 bh_base[nr]();
+ }
 
         hardirq_endlock();
         spin_unlock(&global_bh_lock);
diff -urpN linux-2.5.36/kernel/timer.c linux-2.5.36-ltt/kernel/timer.c
--- linux-2.5.36/kernel/timer.c Tue Sep 17 20:58:50 2002
+++ linux-2.5.36-ltt/kernel/timer.c Thu Sep 19 16:29:57 2002
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/tqueue.h>
 #include <linux/kernel_stat.h>
+#include <linux/trace.h>
 
 #include <asm/uaccess.h>
 
@@ -661,6 +662,7 @@ static inline void update_times(void)
 
 void timer_bh(void)
 {
+ TRACE_EVENT(TRACE_EV_KERNEL_TIMER, NULL);
         update_times();
         run_timer_list();
 }
@@ -790,6 +792,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.36/mm/filemap.c linux-2.5.36-ltt/mm/filemap.c
--- linux-2.5.36/mm/filemap.c Tue Sep 17 20:58:51 2002
+++ linux-2.5.36-ltt/mm/filemap.c Thu Sep 19 16:29:57 2002
@@ -25,6 +25,7 @@
 #include <linux/writeback.h>
 #include <linux/pagevec.h>
 #include <linux/security.h>
+#include <linux/trace.h>
 /*
  * This is needed for the following functions:
  * - try_to_release_page
@@ -636,10 +637,12 @@ void wait_on_page_bit(struct page *page,
                 set_task_state(tsk, TASK_UNINTERRUPTIBLE);
                 if (!test_bit(bit_nr, &page->flags))
                         break;
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_WAIT_START, 0);
                 sync_page(page);
                 schedule();
         } while (test_bit(bit_nr, &page->flags));
         __set_task_state(tsk, TASK_RUNNING);
+ TRACE_MEMORY(TRACE_EV_MEMORY_PAGE_WAIT_END, 0);
         remove_wait_queue(waitqueue, &wait);
 }
 EXPORT_SYMBOL(wait_on_page_bit);
diff -urpN linux-2.5.36/mm/memory.c linux-2.5.36-ltt/mm/memory.c
--- linux-2.5.36/mm/memory.c Tue Sep 17 20:58:57 2002
+++ linux-2.5.36-ltt/mm/memory.c Thu Sep 19 16:29:57 2002
@@ -45,6 +45,9 @@
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 
+#include <linux/module.h>
+#include <linux/trace.h>
+
 #include <asm/pgalloc.h>
 #include <asm/rmap.h>
 #include <asm/uaccess.h>
@@ -1191,6 +1194,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.36/mm/page_alloc.c linux-2.5.36-ltt/mm/page_alloc.c
--- linux-2.5.36/mm/page_alloc.c Tue Sep 17 20:58:44 2002
+++ linux-2.5.36-ltt/mm/page_alloc.c Thu Sep 19 16:35:12 2002
@@ -24,6 +24,7 @@
 #include <linux/suspend.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
+#include <linux/trace.h>
 
 unsigned long totalram_pages;
 unsigned long totalhigh_pages;
@@ -99,6 +100,8 @@ void __free_pages_ok (struct page *page,
                 ClearPageDirty(page);
         BUG_ON(page_count(page) != 0);
 
+ 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, &current->local_pages);
@@ -435,6 +438,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.36/mm/page_io.c linux-2.5.36-ltt/mm/page_io.c
--- linux-2.5.36/mm/page_io.c Tue Sep 17 20:58:45 2002
+++ linux-2.5.36-ltt/mm/page_io.c Thu Sep 19 16:29:57 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 *
@@ -95,6 +96,7 @@ int swap_writepage(struct page *page)
         kstat.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.36/net/core/dev.c linux-2.5.36-ltt/net/core/dev.c
--- linux-2.5.36/net/core/dev.c Tue Sep 17 20:58:58 2002
+++ linux-2.5.36-ltt/net/core/dev.c Thu Sep 19 16:29:57 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;
@@ -1441,6 +1445,8 @@ int netif_receive_skb(struct sk_buff *sk
         skb_bond(skb);
 
         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) {
diff -urpN linux-2.5.36/net/socket.c linux-2.5.36-ltt/net/socket.c
--- linux-2.5.36/net/socket.c Tue Sep 17 20:58:51 2002
+++ linux-2.5.36-ltt/net/socket.c Thu Sep 19 16:29:57 2002
@@ -75,6 +75,8 @@
 #include <linux/module.h>
 #include <linux/highmem.h>
 
+#include <linux/trace.h>
+
 #if defined(CONFIG_KMOD) && defined(CONFIG_NET)
 #include <linux/kmod.h>
 #endif
@@ -518,6 +520,8 @@ int sock_sendmsg(struct socket *sock, st
         int err;
         struct scm_cookie scm;
 
+ TRACE_SOCKET(TRACE_EV_SOCKET_SEND, sock->type, size);
+
         err = scm_send(sock, msg, &scm);
         if (err >= 0) {
                 err = sock->ops->sendmsg(sock, msg, size, &scm);
@@ -532,6 +536,8 @@ int sock_recvmsg(struct socket *sock, st
 
         memset(&scm, 0, sizeof(scm));
 
+ TRACE_SOCKET(TRACE_EV_SOCKET_RECEIVE, sock->type, size);
+
         size = sock->ops->recvmsg(sock, msg, size, flags, &scm);
         if (size >= 0)
                 scm_recv(sock, msg, &scm, flags);
@@ -927,6 +933,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;
@@ -1546,6 +1554,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/



This archive was generated by hypermail 2b29 : Mon Sep 23 2002 - 22:00:28 EST