- sync vserver branch: will help future merges

[linux-2.6.git] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index e55e7bb..4168f63 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -53,6 +53,7 @@
 #include <linux/vfs.h>
 #include <linux/jiffies.h>
 #include <linux/times.h>
+#include <linux/syscalls.h>
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 #include <linux/blkdev.h> /* sector_div */
@@ -169,7 +170,7 @@ out:
  *
  * NOTE: acct_globals.lock MUST be held on entry and exit.
  */
-void acct_file_reopen(struct file *file)
+static void acct_file_reopen(struct file *file)
 {
        struct file *old_acct = NULL;
 
@@ -384,6 +385,8 @@ static void do_acct_process(long exitcode, struct file *file)
        unsigned long vsize;
        unsigned long flim;
        u64 elapsed;
+       u64 run_time;
+       struct timespec uptime;
 
        /*
         * First check to see if there is enough free_space to continue
@@ -398,10 +401,16 @@ static void do_acct_process(long exitcode, struct file *file)
         */
        memset((caddr_t)&ac, 0, sizeof(acct_t));
 
-       ac.ac_version = ACCT_VERSION;
+       ac.ac_version = ACCT_VERSION | ACCT_BYTEORDER;
        strlcpy(ac.ac_comm, current->comm, sizeof(ac.ac_comm));
 
-       elapsed = jiffies_64_to_AHZ(get_jiffies_64() - current->start_time);
+       /* calculate run_time in nsec*/
+       do_posix_clock_monotonic_gettime(&uptime);
+       run_time = (u64)uptime.tv_sec*NSEC_PER_SEC + uptime.tv_nsec;
+       run_time -= (u64)current->start_time.tv_sec*NSEC_PER_SEC
+                                       + current->start_time.tv_nsec;
+       /* convert nsec -> AHZ */
+       elapsed = nsec_to_AHZ(run_time);
 #if ACCT_VERSION==3
        ac.ac_etime = encode_float(elapsed);
 #else
@@ -418,8 +427,12 @@ static void do_acct_process(long exitcode, struct file *file)
 #endif
        do_div(elapsed, AHZ);
        ac.ac_btime = xtime.tv_sec - elapsed;
-       ac.ac_utime = encode_comp_t(jiffies_to_AHZ(current->utime));
-       ac.ac_stime = encode_comp_t(jiffies_to_AHZ(current->stime));
+       ac.ac_utime = encode_comp_t(jiffies_to_AHZ(
+                                           current->signal->utime +
+                                           current->group_leader->utime));
+       ac.ac_stime = encode_comp_t(jiffies_to_AHZ(
+                                           current->signal->stime +
+                                           current->group_leader->stime));
        /* we really need to bite the bullet and change layout */
        ac.ac_uid = current->uid;
        ac.ac_gid = current->gid;
@@ -432,8 +445,8 @@ static void do_acct_process(long exitcode, struct file *file)
        ac.ac_gid16 = current->gid;
 #endif
 #if ACCT_VERSION==3
-       ac.ac_pid = current->pid;
-       ac.ac_ppid = current->parent->pid;
+       ac.ac_pid = current->tgid;
+       ac.ac_ppid = current->parent->tgid;
 #endif
 
        read_lock(&tasklist_lock);      /* pin current->signal */
@@ -441,8 +454,7 @@ static void do_acct_process(long exitcode, struct file *file)
                old_encode_dev(tty_devnum(current->signal->tty)) : 0;
        read_unlock(&tasklist_lock);
 
-       /* ABYTESEX is always set to allow byte order detection */
-       ac.ac_flag = ABYTESEX;
+       ac.ac_flag = 0;
        if (current->flags & PF_FORKNOEXEC)
                ac.ac_flag |= AFORK;
        if (current->flags & PF_SUPERPRIV)
@@ -467,8 +479,10 @@ static void do_acct_process(long exitcode, struct file *file)
        ac.ac_mem = encode_comp_t(vsize);
        ac.ac_io = encode_comp_t(0 /* current->io_usage */);    /* %% */
        ac.ac_rw = encode_comp_t(ac.ac_io / 1024);
-       ac.ac_minflt = encode_comp_t(current->min_flt);
-       ac.ac_majflt = encode_comp_t(current->maj_flt);
+       ac.ac_minflt = encode_comp_t(current->signal->min_flt +
+                                    current->group_leader->min_flt);
+       ac.ac_majflt = encode_comp_t(current->signal->maj_flt +
+                                    current->group_leader->maj_flt);
        ac.ac_swaps = encode_comp_t(0);
        ac.ac_exitcode = exitcode;
 
@@ -481,11 +495,11 @@ static void do_acct_process(long exitcode, struct file *file)
        /*
         * Accounting records are not subject to resource limits.
         */
-       flim = current->rlim[RLIMIT_FSIZE].rlim_cur;
-       current->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
+       flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
+       current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
        file->f_op->write(file, (char *)&ac,
                               sizeof(acct_t), &file->f_pos);
-       current->rlim[RLIMIT_FSIZE].rlim_cur = flim;
+       current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
        set_fs(fs);
 }
 
@@ -514,3 +528,34 @@ void acct_process(long exitcode)
        do_acct_process(exitcode, file);
        fput(file);
 }
+
+
+/*
+ * acct_update_integrals
+ *    -  update mm integral fields in task_struct
+ */
+void acct_update_integrals(struct task_struct *tsk)
+{
+       if (likely(tsk->mm)) {
+               long delta = tsk->stime - tsk->acct_stimexpd;
+
+               if (delta == 0)
+                       return;
+               tsk->acct_stimexpd = tsk->stime;
+               tsk->acct_rss_mem1 += delta * get_mm_counter(tsk->mm, rss);
+               tsk->acct_vm_mem1 += delta * tsk->mm->total_vm;
+       }
+}
+
+/*
+ * acct_clear_integrals
+ *    - clear the mm integral fields in task_struct
+ */
+void acct_clear_integrals(struct task_struct *tsk)
+{
+       if (tsk) {
+               tsk->acct_stimexpd = 0;
+               tsk->acct_rss_mem1 = 0;
+               tsk->acct_vm_mem1 = 0;
+       }
+}