From 9ce83380b282f8d63eccd2882ba200146ce13be7 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@llnl.gov> Date: Thu, 27 Apr 2006 20:30:16 +0000 Subject: [PATCH] more mod to have correct units. --- src/sacct/sacct_stat.c | 4 ++++ src/slurmd/slurmstepd/slurmstepd.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sacct/sacct_stat.c b/src/sacct/sacct_stat.c index 824448a5441..59642ad6426 100644 --- a/src/sacct/sacct_stat.c +++ b/src/sacct/sacct_stat.c @@ -238,6 +238,10 @@ int _sacct_query(resource_allocation_response_msg_t *job, uint32_t step_id) pthread_cond_destroy(&stat_cond); slurm_mutex_destroy(&stat_mutex); if(step.ntasks) { + step.sacct.ave_rss *= 1024; + step.sacct.max_rss *= 1024; + step.sacct.ave_vsize *= 1024; + step.sacct.max_vsize *= 1024; tempf = step.sacct.ave_cpu/step.ntasks; tempf /= 100; step.sacct.ave_cpu = (uint32_t)tempf; diff --git a/src/slurmd/slurmstepd/slurmstepd.c b/src/slurmd/slurmstepd/slurmstepd.c index e7b57c490b1..57ae7b3a1f9 100644 --- a/src/slurmd/slurmstepd/slurmstepd.c +++ b/src/slurmd/slurmstepd/slurmstepd.c @@ -4,7 +4,8 @@ ***************************************************************************** * Copyright (C) 2002 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Mark Grondona <da@llnl.gov>. + * Written by Danny Auble <da@llnl.gov> + * and Christopher Morrone <morrone2@llnl.gov>. * UCRL-CODE-217948. * * This file is part of SLURM, a resource management program. -- GitLab